x/sahara-ci-config
Code Issues Proposed changes

Reconfiguring CI scripts for use second Devstack server

Browse Source 
Change-Id: I7dad59d8a1100ed413e5996e6cd1b7694a7de7b8
This commit is contained in:
Denis Egorenko
2014-07-15 14:57:03 +04:00
parent d2261e1173
commit 83be291837
12 changed files with 131 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/devstack/localrc
View File

@@ -35,11 +35,20 @@ KEYSTONE_TOKEN_FORMAT=UUID
# Change the FLOATING_RANGE to whatever IPs VM is working in. # Change the FLOATING_RANGE to whatever IPs VM is working in.
# In NAT mode it is subnet VMWare Fusion provides, in bridged mode it is your local network. # In NAT mode it is subnet VMWare Fusion provides, in bridged mode it is your local network.
# But only use the top end of the network by using a /27 and starting at the 224 octet. # But only use the top end of the network by using a /27 and starting at the 224 octet.
# Stack-ci lab
FIXED_RANGE=10.0.0.0/24 FIXED_RANGE=10.0.0.0/24
FIXED_NETWORK_SIZE=256 FIXED_NETWORK_SIZE=256
FLOATING_RANGE=172.18.169.0/26 FLOATING_RANGE=172.18.169.0/26
PUBLIC_NETWORK_GATEWAY=172.18.169.1 PUBLIC_NETWORK_GATEWAY=172.18.169.1
# Stack-sahara lab
#FIXED_RANGE=10.1.0.0/24
#NETWORK_GATEWAY=10.1.0.1
#FIXED_NETWORK_SIZE=256
#FLOATING_RANGE=172.16.41.0/26
#PUBLIC_NETWORK_GATEWAY=172.16.41.1
# Enable logging # Enable logging
#SCREEN_LOGDIR=/var/log/devstack #SCREEN_LOGDIR=/var/log/devstack

26
config/nodepool/savanna.yaml
View File

@@ -15,15 +15,16 @@ labels:
image: precise image: precise
min-ready: 5 min-ready: 5
providers: providers:
- name: ci-lab - name: cilab-1
- name: cilab-2
- name: ui - name: ui
image: ui image: ui
min-ready: 1 min-ready: 1
providers: providers:
- name: ci-lab - name: cilab-1
providers: providers:
- name: ci-lab - name: cilab-1
username: 'ci-user' username: 'ci-user'
password: 'nova' password: 'nova'
auth-url: 'http://172.18.168.42:5000/v2.0' auth-url: 'http://172.18.168.42:5000/v2.0'
@@ -32,7 +33,7 @@ providers:
boot-timeout: 120 boot-timeout: 120
pool: public pool: public
networks: networks:
- net-id: 'PRIVATE_NETWORK_ID' - net-id: 'CI_LAB_PRIVATE_NETWORK_ID'
images: images:
- name: precise - name: precise
base-image: 'ubuntu-12.04' base-image: 'ubuntu-12.04'
@@ -44,6 +45,23 @@ providers:
min-ram: 4096 min-ram: 4096
private-key: '/etc/nodepool/id_dsa' private-key: '/etc/nodepool/id_dsa'
setup: prepare_node_ui.sh setup: prepare_node_ui.sh
- name: cilab-2
username: 'ci-user'
password: 'nova'
auth-url: 'http://172.18.168.43:5000/v2.0'
project-id: 'ci'
max-servers: 6
boot-timeout: 120
pool: public
networks:
- net-id: 'STACK_SAHARA_PRIVATE_NETWORK_ID'
images:
- name: precise
base-image: 'ubuntu-12.04'
min-ram: 2048
private-key: '/etc/nodepool/id_dsa'
setup: prepare_node_bare.sh
targets: targets:
- name: savanna-gate - name: savanna-gate
jenkins: jenkins:

10
config/nodepool/scripts/prepare_ui.sh
View File

@@ -11,6 +11,12 @@
#Repository for Openstack Dashboard #Repository for Openstack Dashboard
#sudo add-apt-repository cloud-archive:havana -y #sudo add-apt-repository cloud-archive:havana -y
NETWORK=`ifconfig eth0 | awk -F ' *|:' '/inet addr/{print $4}' | awk -F . '{print $2}'`
if [ "$NETWORK" == "0" ]; then
OPENSTACK_HOST="172.18.168.42"
else
OPENSTACK_HOST="172.18.168.43"
fi
sudo apt-get install libstdc++5 nodejs xserver-xorg libffi-dev apache2 libapache2-mod-wsgi -y sudo apt-get install libstdc++5 nodejs xserver-xorg libffi-dev apache2 libapache2-mod-wsgi -y
git clone https://github.com/openstack/horizon git clone https://github.com/openstack/horizon
@@ -18,7 +24,7 @@ cd horizon && sudo pip install -U -r requirements.txt
python manage.py compress --force python manage.py compress --force
cp -r static/ openstack_dashboard/ cp -r static/ openstack_dashboard/
cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
sudo sed -i "s/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"172.18.168.42\"/g" openstack_dashboard/local/local_settings.py sudo sed -i "s/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"${OPENSTACK_HOST}\"/g" openstack_dashboard/local/local_settings.py
cd .. && sudo mv horizon /opt/ cd .. && sudo mv horizon /opt/
sudo chown -R www-data:www-data /opt/horizon sudo chown -R www-data:www-data /opt/horizon
sudo su -c "echo ' sudo su -c "echo '
@@ -37,7 +43,7 @@ sudo sed -i "s/'openstack_dashboard'/'saharadashboard',\n 'openstack_dashboar
sudo su -c "echo \"HORIZON_CONFIG['dashboards'] += ('sahara',)\" >> /opt/horizon/openstack_dashboard/settings.py" sudo su -c "echo \"HORIZON_CONFIG['dashboards'] += ('sahara',)\" >> /opt/horizon/openstack_dashboard/settings.py"
sudo sed -i "s/#from horizon.utils import secret_key/from horizon.utils import secret_key/g" /opt/horizon/openstack_dashboard/local/local_settings.py sudo sed -i "s/#from horizon.utils import secret_key/from horizon.utils import secret_key/g" /opt/horizon/openstack_dashboard/local/local_settings.py
sudo sed -i "s/#SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.secret_key_store'))/SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.secret_key_store'))/g" /opt/horizon/openstack_dashboard/local/local_settings.py sudo sed -i "s/#SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.secret_key_store'))/SECRET_KEY = secret_key.generate_or_read_from_file(os.path.join(LOCAL_PATH, '.secret_key_store'))/g" /opt/horizon/openstack_dashboard/local/local_settings.py
sudo sed -i "s/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"172.18.168.42\"/g" /opt/horizon/openstack_dashboard/local/local_settings.py sudo sed -i "s/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"${OPENSTACK_HOST}\"/g" /opt/horizon/openstack_dashboard/local/local_settings.py
sudo su -c 'echo -e "SAHARA_USE_NEUTRON = True" >> /opt/horizon/openstack_dashboard/local/local_settings.py' sudo su -c 'echo -e "SAHARA_USE_NEUTRON = True" >> /opt/horizon/openstack_dashboard/local/local_settings.py'
sudo su -c 'echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> /opt/horizon/openstack_dashboard/local/local_settings.py' sudo su -c 'echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> /opt/horizon/openstack_dashboard/local/local_settings.py'
sudo su -c 'echo -e "SAHARA_URL = \"http://127.0.0.1:8386/v1.1\"" >> /opt/horizon/openstack_dashboard/local/local_settings.py' sudo su -c 'echo -e "SAHARA_URL = \"http://127.0.0.1:8386/v1.1\"" >> /opt/horizon/openstack_dashboard/local/local_settings.py'

3
config/zuul/openstack_functions.py
View File

@@ -36,4 +36,5 @@ def single_use_node(item, job, params):
def set_ci_tenant(item, job, params): def set_ci_tenant(item, job, params):
single_use_node(item, job, params) single_use_node(item, job, params)
params['CI_TENANT_ID'] = '-CI_TENANT_ID-' params['CI_LAB_TENANT_ID'] = '-CI_TENANT_ID-'
params['STACK_SAHARA_TENANT_ID'] = '-STACK_SAHARA_TENANT_ID-'

6
jenkins_job_builder/diskimage.yaml
View File

@@ -17,7 +17,8 @@
- project: "integration-cleanup" - project: "integration-cleanup"
predefined-parameters: predefined-parameters:
"PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
\nPREV_JOB=diskimage-integration-{plugin}" \nPREV_JOB=diskimage-integration-{plugin}\
\nHOST_NAME=$NODE_NAME""
node: 'precise' node: 'precise'
- job-template: - job-template:
@@ -39,7 +40,8 @@
- project: "integration-cleanup" - project: "integration-cleanup"
predefined-parameters: predefined-parameters:
"PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
\nPREV_JOB=diskimage-integration-vanilla-{image}-{hadoop-version}" \nPREV_JOB=diskimage-integration-vanilla-{image}-{hadoop-version}\
\nHOST_NAME=$NODE_NAME"
node: 'precise' node: 'precise'
- project: - project:

10
jenkins_job_builder/sahara.yaml
View File

@@ -20,7 +20,8 @@
- project: "integration-cleanup" - project: "integration-cleanup"
predefined-parameters: predefined-parameters:
"PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
\nPREV_JOB=$JOB_NAME" \nPREV_JOB=$JOB_NAME\
\nHOST_NAME=$NODE_NAME"
node: 'precise' node: 'precise'
- job-template: - job-template:
@@ -45,7 +46,8 @@
- project: "integration-cleanup" - project: "integration-cleanup"
predefined-parameters: predefined-parameters:
"PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\ "PREV_BUILD=$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET\
\nPREV_JOB=$JOB_NAME" \nPREV_JOB=$JOB_NAME
\nHOST_NAME=$NODE_NAME"
node: 'precise' node: 'precise'
- project: - project:
@@ -84,6 +86,10 @@
name: PREV_JOB name: PREV_JOB
default: default:
description: description:
- string:
name: HOST_NAME
default:
description:
builders: builders:
- shell: "rm -rf sahara-ci-config\ - shell: "rm -rf sahara-ci-config\

2
slave-scripts/credentials.conf
View File

@@ -1,6 +1,4 @@
[default] [default]
OS_USERNAME=ci-user OS_USERNAME=ci-user
OS_TENANT_NAME=ci OS_TENANT_NAME=ci
OS_AUTH_URL=http://172.18.168.42:5000/v2.0
OS_PASSWORD=nova OS_PASSWORD=nova
OS_IMAGE_ENDPOINT=http://172.18.168.42:8004/v1/-CI_TENANT_ID-

47
slave-scripts/diskimage-creating-integration.sh
View File

@@ -1,5 +1,16 @@
#!/bin/bash #!/bin/bash
NETWORK=`ifconfig eth0 | awk -F ' *|:' '/inet addr/{print $4}' | awk -F . '{print $2}'`
if [ "$NETWORK" == "0" ]; then
OPENSTACK_HOST="172.18.168.42"
HOST="c1"
TENANT_ID="$CI_LAB_TENANT_ID"
else
OPENSTACK_HOST="172.18.168.43"
HOST="c2"
TENANT_ID="$STACK_SAHARA_TENANT_ID"
fi
check_error_code() { check_error_code() {
if [ "$1" != "0" ]; then if [ "$1" != "0" ]; then
echo "$2 image $3 doesn't build" echo "$2 image $3 doesn't build"
@@ -11,13 +22,13 @@ register_vanilla_image() {
# 1 - hadoop version, 2 - username, 3 - image name # 1 - hadoop version, 2 - username, 3 - image name
case "$1" in case "$1" in
1) 1)
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.2.1'='True' --property '_sahara_tag_1.1.2'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}" glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.2.1'='True' --property '_sahara_tag_1.1.2'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}"
;; ;;
2.3) 2.3)
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.3.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}" glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.3.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}"
;; ;;
2.4) 2.4)
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.4.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}" glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.4.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}"
;; ;;
esac esac
} }
@@ -26,16 +37,16 @@ register_hdp_image() {
# 1 - hadoop version, 2 - username, 3 - image name # 1 - hadoop version, 2 - username, 3 - image name
case "$1" in case "$1" in
1) 1)
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.3.2'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'="${2}" glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.3.2'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'="${2}"
;; ;;
2) 2)
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.0.6'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'="${2}" glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.0.6'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'="${2}"
;; ;;
esac esac
} }
delete_image() { delete_image() {
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-delete $1 glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-delete $1
} }
upload_image() { upload_image() {
@@ -63,7 +74,7 @@ upload_image() {
rename_image() { rename_image() {
# 1 - source image, 2 - target image # 1 - source image, 2 - target image
glance --os-username ci-user --os-auth-url http://172.18.168.42:5000/v2.0/ --os-tenant-name ci --os-password nova image-update $1 --name $2 glance --os-username ci-user --os-auth-url http://$OPENSTACK_HOST:5000/v2.0/ --os-tenant-name ci --os-password nova image-update $1 --name $2
} }
plugin="$1" plugin="$1"
@@ -79,11 +90,11 @@ MAP_REDUCE_TEST=False
SWIFT_TEST=True SWIFT_TEST=True
SCALING_TEST=True SCALING_TEST=True
TRANSIENT_TEST=True TRANSIENT_TEST=True
VANILLA_IMAGE=ci-sahara-vanilla-${image_type}-${GERRIT_CHANGE_NUMBER}-hadoop_1 VANILLA_IMAGE=$HOST-sahara-vanilla-${image_type}-${GERRIT_CHANGE_NUMBER}-hadoop_1
VANILLA_TWO_IMAGE=ci-sahara-vanilla-${image_type}-${GERRIT_CHANGE_NUMBER}-hadoop_${hadoop_version} VANILLA_TWO_IMAGE=$HOST-sahara-vanilla-${image_type}-${GERRIT_CHANGE_NUMBER}-hadoop_2
HDP_IMAGE=ci-sahara-hdp-centos-${GERRIT_CHANGE_NUMBER}-hadoop_1 HDP_IMAGE=$HOST-sahara-hdp-centos-${GERRIT_CHANGE_NUMBER}-hadoop_1
HDP_TWO_IMAGE=ci-sahara-hdp-centos-${GERRIT_CHANGE_NUMBER}-hadoop_2 HDP_TWO_IMAGE=$HOST-sahara-hdp-centos-${GERRIT_CHANGE_NUMBER}-hadoop_2
SPARK_IMAGE=ci-sahara-spark-ubuntu-${GERRIT_CHANGE_NUMBER} SPARK_IMAGE=$HOST-sahara-spark-ubuntu-${GERRIT_CHANGE_NUMBER}
SSH_USERNAME="ubuntu" SSH_USERNAME="ubuntu"
case $plugin in case $plugin in
@@ -202,7 +213,7 @@ echo "infrastructure_engine=direct
" >> etc/sahara/sahara.conf " >> etc/sahara/sahara.conf
echo " echo "
os_auth_host=172.18.168.42 os_auth_host=$OPENSTACK_HOST
os_auth_port=5000 os_auth_port=5000
os_admin_username=ci-user os_admin_username=ci-user
os_admin_password=nova os_admin_password=nova
@@ -213,8 +224,8 @@ node_domain = nl
[database] [database]
connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8 connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8
[keystone_authtoken] [keystone_authtoken]
auth_uri=http://172.18.168.42:5000/v2.0/ auth_uri=http://$OPENSTACK_HOST:5000/v2.0/
identity_uri=http://172.18.168.42:35357/ identity_uri=http://$OPENSTACK_HOST:35357/
admin_user=ci-user admin_user=ci-user
admin_password=nova admin_password=nova
admin_tenant_name=ci" >> etc/sahara/sahara.conf admin_tenant_name=ci" >> etc/sahara/sahara.conf
@@ -261,12 +272,12 @@ echo "[COMMON]
OS_USERNAME = 'ci-user' OS_USERNAME = 'ci-user'
OS_PASSWORD = 'nova' OS_PASSWORD = 'nova'
OS_TENANT_NAME = 'ci' OS_TENANT_NAME = 'ci'
OS_TENANT_ID = '$CI_TENANT_ID' OS_TENANT_ID = '$TENANT_ID'
OS_AUTH_URL = 'http://172.18.168.42:5000/v2.0' OS_AUTH_URL = 'http://$OPENSTACK_HOST:5000/v2.0'
SAVANNA_HOST = '$ADDR' SAVANNA_HOST = '$ADDR'
FLAVOR_ID = '20' FLAVOR_ID = '20'
CLUSTER_CREATION_TIMEOUT = $TIMEOUT CLUSTER_CREATION_TIMEOUT = $TIMEOUT
CLUSTER_NAME = '$image_os-$hadoop_version-$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET' CLUSTER_NAME = '$HOST-$image_os-$hadoop_version-$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET'
FLOATING_IP_POOL = 'public' FLOATING_IP_POOL = 'public'
NEUTRON_ENABLED = True NEUTRON_ENABLED = True
INTERNAL_NEUTRON_NETWORK = 'private' INTERNAL_NEUTRON_NETWORK = 'private'

23
slave-scripts/gate-savanna-integration-new.sh
View File

@@ -3,6 +3,17 @@
#this is to fix bug with testtools==0.9.35 #this is to fix bug with testtools==0.9.35
#sed 's/testtools>=0.9.32/testtools==0.9.34/' -i test-requirements.txt #sed 's/testtools>=0.9.32/testtools==0.9.34/' -i test-requirements.txt
NETWORK=`ifconfig eth0 | awk -F ' *|:' '/inet addr/{print $4}' | awk -F . '{print $2}'`
if [ "$NETWORK" == "0" ]; then
OPENSTACK_HOST="172.18.168.42"
HOST="c1"
TENANT_ID="$CI_LAB_TENANT_ID"
else
OPENSTACK_HOST="172.18.168.43"
HOST="c2"
TENANT_ID="$STACK_SAHARA_TENANT_ID"
fi
sudo pip install . sudo pip install .
WORKSPACE=${1:-$WORKSPACE} WORKSPACE=${1:-$WORKSPACE}
@@ -117,7 +128,7 @@ else
fi fi
echo " echo "
os_auth_host=172.18.168.42 os_auth_host=$OPENSTACK_HOST
os_auth_port=5000 os_auth_port=5000
os_admin_username=ci-user os_admin_username=ci-user
os_admin_password=nova os_admin_password=nova
@@ -128,8 +139,8 @@ min_transient_cluster_active_time=30
[database] [database]
connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8 connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8
[keystone_authtoken] [keystone_authtoken]
auth_uri=http://172.18.168.42:5000/v2.0/ auth_uri=http://$OPENSTACK_HOST:5000/v2.0/
identity_uri=http://172.18.168.42:35357/ identity_uri=http://$OPENSTACK_HOST:35357/
admin_user=ci-user admin_user=ci-user
admin_password=nova admin_password=nova
admin_tenant_name=ci admin_tenant_name=ci
@@ -172,12 +183,12 @@ echo "[COMMON]
OS_USERNAME = 'ci-user' OS_USERNAME = 'ci-user'
OS_PASSWORD = 'nova' OS_PASSWORD = 'nova'
OS_TENANT_NAME = 'ci' OS_TENANT_NAME = 'ci'
OS_TENANT_ID = '$CI_TENANT_ID' OS_TENANT_ID = '$TENANT_ID'
OS_AUTH_URL = 'http://172.18.168.42:5000/v2.0' OS_AUTH_URL = 'http://$OPENSTACK_HOST:5000/v2.0'
SAVANNA_HOST = '$ADDR' SAVANNA_HOST = '$ADDR'
FLAVOR_ID = '20' FLAVOR_ID = '20'
CLUSTER_CREATION_TIMEOUT = $TIMEOUT CLUSTER_CREATION_TIMEOUT = $TIMEOUT
CLUSTER_NAME = 'ci-$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET' CLUSTER_NAME = '$HOST-$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET'
FLOATING_IP_POOL = 'public' FLOATING_IP_POOL = 'public'
NEUTRON_ENABLED = True NEUTRON_ENABLED = True
INTERNAL_NEUTRON_NETWORK = 'private' INTERNAL_NEUTRON_NETWORK = 'private'

15
slave-scripts/gate-ui-tests.sh
View File

@@ -3,6 +3,13 @@
sudo iptables -F sudo iptables -F
sudo pip install $WORKSPACE sudo pip install $WORKSPACE
NETWORK=`ifconfig eth0 | awk -F ' *|:' '/inet addr/{print $4}' | awk -F . '{print $2}'`
if [ "$NETWORK" == "0" ]; then
OPENSTACK_HOST="172.18.168.42"
else
OPENSTACK_HOST="172.18.168.43"
fi
SAVANNA_LOG=/tmp/sahara.log SAVANNA_LOG=/tmp/sahara.log
SCR_CHECK=$(ps aux | grep screen | grep display) SCR_CHECK=$(ps aux | grep screen | grep display)
@@ -56,7 +63,7 @@ cd $HOME
echo " echo "
[DEFAULT] [DEFAULT]
os_auth_host=172.18.168.42 os_auth_host=$OPENSTACK_HOST
os_auth_port=5000 os_auth_port=5000
os_admin_username=ci-user os_admin_username=ci-user
os_admin_password=nova os_admin_password=nova
@@ -66,8 +73,8 @@ use_neutron=true
[database] [database]
connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8 connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8
[keystone_authtoken] [keystone_authtoken]
auth_uri=http://172.18.168.42:5000/v2.0/ auth_uri=http://$OPENSTACK_HOST:5000/v2.0/
identity_uri=http://172.18.168.42:35357/ identity_uri=http://$OPENSTACK_HOST:35357/
admin_user=ci-user admin_user=ci-user
admin_password=nova admin_password=nova
admin_tenant_name=ci" > sahara.conf admin_tenant_name=ci" > sahara.conf
@@ -110,7 +117,7 @@ tenant = 'ci'
flavor = 'qa-flavor' flavor = 'qa-flavor'
neutron_management_network = 'private' neutron_management_network = 'private'
floationg_ip_pool = 'public' floationg_ip_pool = 'public'
keystone_url = 'http://172.18.168.42:5000/v2.0' keystone_url = 'http://$OPENSTACK_HOST:5000/v2.0'
await_element = 120 await_element = 120
image_name_for_register = 'ubuntu-12.04' image_name_for_register = 'ubuntu-12.04'
image_name_for_edit = "savanna-itests-ci-vanilla-image" image_name_for_edit = "savanna-itests-ci-vanilla-image"

25
slave-scripts/integration-cleanup.sh
View File

@@ -3,7 +3,16 @@
cd /opt/ci/jenkins-jobs/sahara-ci-config/slave-scripts cd /opt/ci/jenkins-jobs/sahara-ci-config/slave-scripts
sleep 20 sleep 20
source $JENKINS_HOME/credentials
JOB_TYPE=$(echo $PREV_JOB | awk -F '-' '{ print $1 }') JOB_TYPE=$(echo $PREV_JOB | awk -F '-' '{ print $1 }')
HOST="c"$(echo $HOST_NAME | awk -F '-' '{ print $3 }')
if [ "$HOST" == "c1" ]; then
export os_auth_url="http://$OPENSTACK_HOST_CI_LAB:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_CI_LAB:8004/v1/$CI_LAB_TENANT_ID"
else
export os_auth_url="http://$OPENSTACK_HOST_SAHARA_STACK:5000/v2.0"
export os_image_endpoint="http://$OPENSTACK_HOST_SAHARA_STACK:8004/v1/$STACK_SAHARA_TENANT_ID"
fi
if [ $JOB_TYPE == 'diskimage' ]; then if [ $JOB_TYPE == 'diskimage' ]; then
PLUGIN=$(echo $PREV_JOB | awk -F '-' '{ print $3 }') PLUGIN=$(echo $PREV_JOB | awk -F '-' '{ print $3 }')
if [ $PLUGIN == 'vanilla' ]; then if [ $PLUGIN == 'vanilla' ]; then
@@ -17,18 +26,18 @@ if [ $JOB_TYPE == 'diskimage' ]; then
fi fi
HADOOP_VERSION=$(echo $PREV_JOB | awk -F '-' '{ print $5}') HADOOP_VERSION=$(echo $PREV_JOB | awk -F '-' '{ print $5}')
if [ "$HADOOP_VERSION" == '1' ]; then if [ "$HADOOP_VERSION" == '1' ]; then
python cleanup.py cleanup $os-$HADOOP_VERSION-$PREV_BUILD-vanilla-v1 python cleanup.py cleanup $HOST-$os-$HADOOP_VERSION-$PREV_BUILD-vanilla-v1
elif [ "$HADOOP_VERSION" == '2.3' ]; then elif [ "$HADOOP_VERSION" == '2.3' ]; then
python cleanup.py cleanup $os-2-3-$PREV_BUILD-vanilla-v2 python cleanup.py cleanup $HOST-$os-2-3-$PREV_BUILD-vanilla-v2
else else
python cleanup.py cleanup $os-2-4-$PREV_BUILD-vanilla-v2 python cleanup.py cleanup $HOST-$os-2-4-$PREV_BUILD-vanilla-v2
fi fi
elif [ $PLUGIN == 'hdp1' ]; then elif [ $PLUGIN == 'hdp1' ]; then
python cleanup.py cleanup cos-1-$PREV_BUILD-hdp python cleanup.py cleanup $HOST-cos-1-$PREV_BUILD-hdp
elif [ $PLUGIN == 'hdp2' ]; then elif [ $PLUGIN == 'hdp2' ]; then
python cleanup.py cleanup cos-2-$PREV_BUILD-hdp-v2 python cleanup.py cleanup $HOST-cos-2-$PREV_BUILD-hdp-v2
else else
python cleanup.py cleanup uos-1-$PREV_BUILD-$PLUGIN python cleanup.py cleanup $HOST-uos-1-$PREV_BUILD-$PLUGIN
fi fi
else else
JOB_TYPE=$(echo $PREV_JOB | awk -F '-' '{ print $4 }') JOB_TYPE=$(echo $PREV_JOB | awk -F '-' '{ print $4 }')
@@ -53,8 +62,8 @@ else
then then
JOB_TYPE=vanilla-v1 JOB_TYPE=vanilla-v1
fi fi
python cleanup.py cleanup-heat ci-$PREV_BUILD-$JOB_TYPE python cleanup.py cleanup-heat $HOST-$PREV_BUILD-$JOB_TYPE
else else
python cleanup.py cleanup -$PREV_BUILD-$JOB_TYPE python cleanup.py cleanup $HOST-$PREV_BUILD-$JOB_TYPE
fi fi
fi fi

7
slave-scripts/update_config.sh
View File

@@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
source $JENKINS_HOME/credentials source $JENKINS_HOME/credentials
sed "s%-CI_TENANT_ID-%$CI_TENANT_ID%g" -i $WORKSPACE/config/zuul/openstack_functions.py sed "s%-CI_LAB_TENANT_ID-%$CI_LAB_TENANT_ID%g" -i $WORKSPACE/config/zuul/openstack_functions.py
sed "s%-CI_TENANT_ID-%$CI_TENANT_ID%g" -i $WORKSPACE/slave-scripts/credentials.conf sed "s%-STACK_SAHARA_TENANT_ID-%$STACK_SAHARA_TENANT_ID%g" -i $WORKSPACE/config/zuul/openstack_functions.py
sudo su - jenkins -c "cat $WORKSPACE/slave-scripts/credentials.conf > /etc/jenkins_jobs/credentials.conf" sudo su - jenkins -c "cat $WORKSPACE/slave-scripts/credentials.conf > /etc/jenkins_jobs/credentials.conf"
sudo su - zuul -c "cat $WORKSPACE/config/zuul/zuul.conf > /etc/zuul/zuul.conf" sudo su - zuul -c "cat $WORKSPACE/config/zuul/zuul.conf > /etc/zuul/zuul.conf"
@@ -12,7 +12,8 @@ sudo su - zuul -c "cat $WORKSPACE/config/zuul/logging.conf > /etc/zuul/logging.c
sudo su - zuul -c "cat $WORKSPACE/config/zuul/openstack_functions.py > /etc/zuul/openstack_functions.py" sudo su - zuul -c "cat $WORKSPACE/config/zuul/openstack_functions.py > /etc/zuul/openstack_functions.py"
sudo service zuul reload sudo service zuul reload
sed "s%- net-id: 'PRIVATE_NETWORK_ID'%- net-id: '$PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/savanna.yaml sed "s%- net-id: 'CI_LAB_PRIVATE_NETWORK_ID'%- net-id: '$CI_LAB_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/savanna.yaml
sed "s%- net-id: 'STACK_SAHARA_PRIVATE_NETWORK_ID'%- net-id: '$STACK_SAHARA_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/savanna.yaml
sed "s%apikey: JENKINS_API_KEY%apikey: $JENKINS_API_KEY%g" -i $WORKSPACE/config/nodepool/savanna.yaml sed "s%apikey: JENKINS_API_KEY%apikey: $JENKINS_API_KEY%g" -i $WORKSPACE/config/nodepool/savanna.yaml
sed "s%credentials-id: CREDENTIALS_ID%credentials-id: $CREDENTIALS_ID%g" -i $WORKSPACE/config/nodepool/savanna.yaml sed "s%credentials-id: CREDENTIALS_ID%credentials-id: $CREDENTIALS_ID%g" -i $WORKSPACE/config/nodepool/savanna.yaml
sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/savanna.yaml > /etc/nodepool/nodepool.yaml" sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/savanna.yaml > /etc/nodepool/nodepool.yaml"