diff --git a/config/devstack/local.sh b/config/devstack/local.sh index 0e320810..f62bc0ed 100644 --- a/config/devstack/local.sh +++ b/config/devstack/local.sh @@ -5,8 +5,8 @@ export OS_AUTH_URL=http://127.0.0.1:5000/v2.0/ VANILLA23_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-2.3.0-ubuntu-13.10.qcow2 VANILLA24_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-2.4.1-ubuntu-13.10.qcow2 -VANILLA_IMAGE_PATH=/home/ubuntu/QA/sahara-icehouse-vanilla-1.2.1-ubuntu-13.10.qcow2 -HDP1_IMAGE_PATH=/home/ubuntu/QA/centos-6_4-64-hdp-1.3-sk +VANILLA_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-1.2.1-ubuntu-13.10.qcow2 +HDP1_IMAGE_PATH=/home/ubuntu/images/centos-6_4-64-hdp-1.3-sk HDP2_IMAGE_PATH=/home/ubuntu/images/centos-6_4-64-hdp-2-0.qcow2 UBUNTU_IMAGE_PATH=/home/ubuntu/images/ubuntu-12.04.qcow2 CDH_IMAGE_PATH=/home/ubuntu/images/ubuntu_cdh.qcow2 @@ -46,8 +46,8 @@ wget http://cloud-images.ubuntu.com/releases/precise/release/ubuntu-12.04-server glance image-create --name ubuntu-vanilla-2.3-latest --file $VANILLA23_IMAGE_PATH --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'='ubuntu' glance image-create --name ubuntu-vanilla-2.4-latest --file $VANILLA24_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.4.1'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu' -glance image-create --name savanna-itests-ci-vanilla-image --file $VANILLA_IMAGE_PATH --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'='ubuntu' -glance image-create --name savanna-itests-ci-hdp-image-jdk-iptables-off --file $HDP1_IMAGE_PATH --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'='root' +glance image-create --name sahara-itests-ci-vanilla-image --file $VANILLA_IMAGE_PATH --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'='ubuntu' +glance image-create --name sahara-itests-ci-hdp-image-jdk-iptables-off --file $HDP1_IMAGE_PATH --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'='root' glance image-create --name centos-6_4-64-hdp-2-0-hw --file $HDP2_IMAGE_PATH --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'='root' glance image-create --name ubuntu-12.04 --file ubuntu-12.04-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --is-public=true glance image-create --name ubuntu_cdh_latest --file $CDH_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_5'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="ubuntu" diff --git a/config/nodepool/savanna.yaml b/config/nodepool/sahara.yaml similarity index 98% rename from config/nodepool/savanna.yaml rename to config/nodepool/sahara.yaml index 2c9dbd76..642ba94d 100644 --- a/config/nodepool/savanna.yaml +++ b/config/nodepool/sahara.yaml @@ -63,7 +63,7 @@ providers: setup: prepare_node_bare.sh targets: - - name: savanna-gate + - name: sahara-gate jenkins: url: http://127.0.0.1/jenkins user: admin diff --git a/config/nodepool/scripts/prepare_node.sh b/config/nodepool/scripts/prepare_node.sh index 70c5dc96..04bad486 100755 --- a/config/nodepool/scripts/prepare_node.sh +++ b/config/nodepool/scripts/prepare_node.sh @@ -41,9 +41,9 @@ sudo mkdir -p /opt/git echo "mysql-server mysql-server/root_password select $MYSQL_PASS" | sudo debconf-set-selections echo "mysql-server mysql-server/root_password_again select $MYSQL_PASS" | sudo debconf-set-selections sudo apt-get -y install mysql-server libpq-dev libmysqlclient-dev -mysql -uroot -p$MYSQL_PASS -Bse "create database savanna" -mysql -uroot -p$MYSQL_PASS -Bse "CREATE USER 'savanna-citest'@'localhost' IDENTIFIED BY 'savanna-citest'" -mysql -uroot -p$MYSQL_PASS -Bse "GRANT ALL ON savanna.* TO 'savanna-citest'@'localhost'" +mysql -uroot -p$MYSQL_PASS -Bse "create database sahara" +mysql -uroot -p$MYSQL_PASS -Bse "CREATE USER 'sahara-citest'@'localhost' IDENTIFIED BY 'sahara-citest'" +mysql -uroot -p$MYSQL_PASS -Bse "GRANT ALL ON sahara.* TO 'sahara-citest'@'localhost'" mysql -uroot -p$MYSQL_PASS -Bse "flush privileges" sudo service mysql stop diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index 3012af0b..956de9b8 100644 --- a/config/zuul/layout.yaml +++ b/config/zuul/layout.yaml @@ -43,7 +43,7 @@ projects: - gate-sahara-integration-cdh - gate-sahara-integration-transient - gate-sahara-integration-heat_transient - - gate-savanna-pep8-trunk + - gate-sahara-pep8-trunk - name: openstack/python-saharaclient check: @@ -56,7 +56,7 @@ projects: - gate-saharaclient-integration-cdh - gate-saharaclient-integration-transient - gate-saharaclient-integration-heat_transient - - gate-savanna-pep8-trunk + - gate-sahara-pep8-trunk - name: openstack/sahara-dashboard check: @@ -98,7 +98,7 @@ jobs: branch: ^(master|milestone-proposed|stable/icehouse)$ - name: diskimage-integration-hdp2 voting: false - - name: gate-savanna-pep8-trunk + - name: gate-sahara-pep8-trunk voting: false - name: diskimage-integration-vanilla-ubuntu-2.4 voting: false diff --git a/jenkins_job_builder/sahara-ui.yaml b/jenkins_job_builder/sahara-ui.yaml index 1faa61b0..4c688dd6 100644 --- a/jenkins_job_builder/sahara-ui.yaml +++ b/jenkins_job_builder/sahara-ui.yaml @@ -4,8 +4,8 @@ defaults: global description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ \n

Please use this repository to make changes: https://github.com/stackforge/sahara-ci-config\ - \n

Title: Tests for savanna dashboard
\ - \nDescription: This job installs savanna-dashboars and run selenium tests.
\ + \n

Title: Tests for Sahara dashboard
\ + \nDescription: This job installs Sahara-dashboard and run selenium tests.
\ \nMaintainer: Vadim Rovachev
" node: ui disabled: false diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index 6c01afdd..b2b122b8 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/jenkins_job_builder/sahara.yaml @@ -6,7 +6,7 @@ - gerrit-git-prep - shell: "rm -rf sahara-ci-config\ \ngit clone https://github.com/stackforge/sahara-ci-config /tmp/sahara-ci-config\ - \nbash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient-integration-new.sh" + \nbash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient-integration.sh" properties: - zeromq-event wrappers: @@ -32,7 +32,7 @@ - gerrit-git-prep - shell: "rm -rf sahara-ci-config\ \ngit clone https://github.com/stackforge/sahara-ci-config\ - \nbash -x sahara-ci-config/slave-scripts/gate-savanna-integration-new.sh" + \nbash -x sahara-ci-config/slave-scripts/gate-sahara-integration.sh" properties: - zeromq-event wrappers: @@ -51,7 +51,7 @@ node: 'precise' - project: - name: savanna + name: sahara github-org: openstack plugin: - vanilla-1 @@ -98,7 +98,7 @@ \nbash sahara-ci-config/slave-scripts/integration-cleanup.sh" - job: - name: gate-savanna-pep8-trunk + name: gate-sahara-pep8-trunk project-type: freestyle defaults: global description: "This job is managed by Jenkins Job Builder, do not edit it through WebUI.\ @@ -112,7 +112,7 @@ - gerrit-git-prep - shell: "rm -rf sahara-ci-config\ \ngit clone https://github.com/stackforge/sahara-ci-config\ - \nbash -x sahara-ci-config/slave-scripts/gate-savanna-pep8-trunk.sh" + \nbash -x sahara-ci-config/slave-scripts/gate-sahara-pep8-trunk.sh" properties: - zeromq-event publishers: diff --git a/slave-scripts/diskimage-creating-integration.sh b/slave-scripts/diskimage-creating-integration.sh index 9b99ef1c..2ecc834e 100644 --- a/slave-scripts/diskimage-creating-integration.sh +++ b/slave-scripts/diskimage-creating-integration.sh @@ -204,8 +204,8 @@ fi rm -rf /tmp/cache rm -f $LOG_FILE -mysql -usavanna-citest -psavanna-citest -Bse "DROP DATABASE IF EXISTS savanna" -mysql -usavanna-citest -psavanna-citest -Bse "create database savanna" +mysql -usahara-citest -psahara-citest -Bse "DROP DATABASE IF EXISTS sahara" +mysql -usahara-citest -psahara-citest -Bse "create database sahara" BUILD_ID=dontKill #sudo pip install tox @@ -240,7 +240,7 @@ use_identity_api_v3=true use_neutron=true node_domain = nl [database] -connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8 +connection=mysql://sahara-citest:sahara-citest@localhost/sahara?charset=utf8 [keystone_authtoken] auth_uri=http://$OPENSTACK_HOST:5000/v2.0/ identity_uri=http://$OPENSTACK_HOST:35357/ @@ -257,12 +257,12 @@ echo "----------- end of sahara.conf -----------" #echo " #[global] #timeout = 60 -#index-url = http://savanna-ci.vm.mirantis.net/pypi/savanna/ +#index-url = http://sahara-ci.vm.mirantis.net/pypi/sahara/ #extra-index-url = https://pypi.python.org/simple/ #download-cache = /home/ubuntu/.pip/cache/ #[install] #use-mirrors = true -#find-links = http://savanna-ci.vm.mirantis.net:8181/simple/ +#find-links = http://sahara-ci.vm.mirantis.net:8181/simple/ #" > ~/.pip/pip.conf echo " [global] @@ -292,7 +292,7 @@ OS_PASSWORD = 'nova' OS_TENANT_NAME = 'ci' OS_TENANT_ID = '$TENANT_ID' OS_AUTH_URL = 'http://$OPENSTACK_HOST:5000/v2.0' -SAVANNA_HOST = '$ADDR' +SAHARA_HOST = '$ADDR' FLAVOR_ID = '20' CLUSTER_CREATION_TIMEOUT = $TIMEOUT CLUSTER_NAME = '$HOST-$image_os-$hadoop_version-$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET' diff --git a/slave-scripts/gate-savanna-integration-new.sh b/slave-scripts/gate-sahara-integration.sh similarity index 95% rename from slave-scripts/gate-savanna-integration-new.sh rename to slave-scripts/gate-sahara-integration.sh index daf950da..bd5e4f67 100644 --- a/slave-scripts/gate-savanna-integration-new.sh +++ b/slave-scripts/gate-sahara-integration.sh @@ -39,9 +39,9 @@ SWIFT_TEST=False SCALING_TEST=False TRANSIENT_TEST=True ONLY_TRANSIENT_TEST=False -HDP1_IMAGE=savanna-itests-ci-hdp-image-jdk-iptables-off +HDP1_IMAGE=sahara-itests-ci-hdp-image-jdk-iptables-off HDP2_IMAGE=centos-6_4-64-hdp-2-0-hw -VANILLA_IMAGE=savanna-itests-ci-vanilla-image +VANILLA_IMAGE=sahara-itests-ci-vanilla-image CDH_IMAGE=ubuntu_cdh_latest HEAT_JOB=False @@ -73,7 +73,7 @@ then HADOOP_VERSION=$(echo $JOB_NAME | awk -F '-' '{ print $5}') if [ "$HADOOP_VERSION" == "1" ]; then VANILLA_JOB=True - VANILLA_IMAGE=savanna-itests-ci-vanilla-image + VANILLA_IMAGE=sahara-itests-ci-vanilla-image echo "Vanilla detected" else VANILLA2_JOB=True @@ -118,8 +118,8 @@ fi rm -rf /tmp/cache rm -f $LOG_FILE -mysql -usavanna-citest -psavanna-citest -Bse "DROP DATABASE IF EXISTS savanna" -mysql -usavanna-citest -psavanna-citest -Bse "create database savanna" +mysql -usahara-citest -psahara-citest -Bse "DROP DATABASE IF EXISTS sahara" +mysql -usahara-citest -psahara-citest -Bse "create database sahara" BUILD_ID=dontKill @@ -155,9 +155,9 @@ os_admin_tenant_name=ci use_identity_api_v3=true use_neutron=true min_transient_cluster_active_time=30 -node_domain = nl +node_domain=nl [database] -connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8 +connection=mysql://sahara-citest:sahara-citest@localhost/sahara?charset=utf8 [keystone_authtoken] auth_uri=http://$OPENSTACK_HOST:5000/v2.0/ identity_uri=http://$OPENSTACK_HOST:35357/ @@ -205,7 +205,7 @@ OS_PASSWORD = 'nova' OS_TENANT_NAME = 'ci' OS_TENANT_ID = '$TENANT_ID' OS_AUTH_URL = 'http://$OPENSTACK_HOST:5000/v2.0' -SAVANNA_HOST = '$ADDR' +SAHARA_HOST = '$ADDR' FLAVOR_ID = '20' CLUSTER_CREATION_TIMEOUT = $TIMEOUT CLUSTER_NAME = '$HOST-$HADOOP_VERSION-$BUILD_NUMBER-$ZUUL_CHANGE-$ZUUL_PATCHSET' diff --git a/slave-scripts/gate-savanna-pep8-trunk.sh b/slave-scripts/gate-sahara-pep8-trunk.sh similarity index 97% rename from slave-scripts/gate-savanna-pep8-trunk.sh rename to slave-scripts/gate-sahara-pep8-trunk.sh index 5fcd2378..fb423b22 100644 --- a/slave-scripts/gate-savanna-pep8-trunk.sh +++ b/slave-scripts/gate-sahara-pep8-trunk.sh @@ -1,6 +1,6 @@ #!/bin/bash -xe -source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack savanna +source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack sahara set -o pipefail diff --git a/slave-scripts/gate-saharaclient-integration-new.sh b/slave-scripts/gate-saharaclient-integration.sh similarity index 72% rename from slave-scripts/gate-saharaclient-integration-new.sh rename to slave-scripts/gate-saharaclient-integration.sh index 520fe5a2..a9a4fa4b 100644 --- a/slave-scripts/gate-saharaclient-integration-new.sh +++ b/slave-scripts/gate-saharaclient-integration.sh @@ -9,4 +9,4 @@ tox -e integration --notest # change sahara-client .tox/integration/bin/pip install $WORKSPACE -bash -x /tmp/sahara-ci-config/slave-scripts/gate-savanna-integration-new.sh /tmp/sahara +bash -x /tmp/sahara-ci-config/slave-scripts/gate-sahara-integration.sh /tmp/sahara diff --git a/slave-scripts/gate-ui-tests.sh b/slave-scripts/gate-ui-tests.sh index c6aadca8..4e5ff761 100644 --- a/slave-scripts/gate-ui-tests.sh +++ b/slave-scripts/gate-ui-tests.sh @@ -10,7 +10,7 @@ else OPENSTACK_HOST="172.18.168.43" fi -SAVANNA_LOG=/tmp/sahara.log +SAHARA_LOG=/tmp/sahara.log SCR_CHECK=$(ps aux | grep screen | grep display) if [ -n "$SCR_CHECK" ]; then @@ -27,11 +27,8 @@ fi ps aux | grep X -#rm -f /tmp/savanna-server.db -rm -rf /tmp/cache - -mysql -usavanna-citest -psavanna-citest -Bse "DROP DATABASE IF EXISTS savanna" -mysql -usavanna-citest -psavanna-citest -Bse "create database savanna" +mysql -usahara-citest -psahara-citest -Bse "DROP DATABASE IF EXISTS sahara" +mysql -usahara-citest -psahara-citest -Bse "create database sahara" BUILD_ID=dontKill @@ -71,7 +68,7 @@ os_admin_tenant_name=ci use_floating_ips=true use_neutron=true [database] -connection=mysql://savanna-citest:savanna-citest@localhost/savanna?charset=utf8 +connection=mysql://sahara-citest:sahara-citest@localhost/sahara?charset=utf8 [keystone_authtoken] auth_uri=http://$OPENSTACK_HOST:5000/v2.0/ identity_uri=http://$OPENSTACK_HOST:35357/ @@ -114,11 +111,11 @@ floationg_ip_pool = 'public' keystone_url = 'http://$OPENSTACK_HOST:5000/v2.0' await_element = 120 image_name_for_register = 'ubuntu-12.04' -image_name_for_edit = "savanna-itests-ci-vanilla-image" +image_name_for_edit = "sahara-itests-ci-vanilla-image" [vanilla] skip_plugin_tests = False skip_edp_test = False -base_image = "savanna-itests-ci-vanilla-image" +base_image = "sahara-itests-ci-vanilla-image" [hdp] skip_plugin_tests = False hadoop_version = '1.3.2' diff --git a/slave-scripts/update_config.sh b/slave-scripts/update_config.sh index 1e506f16..03c558ec 100644 --- a/slave-scripts/update_config.sh +++ b/slave-scripts/update_config.sh @@ -12,11 +12,11 @@ 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 service zuul reload -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%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" +sed "s%- net-id: 'CI_LAB_PRIVATE_NETWORK_ID'%- net-id: '$CI_LAB_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/sahara.yaml +sed "s%- net-id: 'STACK_SAHARA_PRIVATE_NETWORK_ID'%- net-id: '$STACK_SAHARA_PRIVATE_NETWORK_ID'%g" -i $WORKSPACE/config/nodepool/sahara.yaml +sed "s%apikey: JENKINS_API_KEY%apikey: $JENKINS_API_KEY%g" -i $WORKSPACE/config/nodepool/sahara.yaml +sed "s%credentials-id: CREDENTIALS_ID%credentials-id: $CREDENTIALS_ID%g" -i $WORKSPACE/config/nodepool/sahara.yaml +sudo su - nodepool -c "cat $WORKSPACE/config/nodepool/sahara.yaml > /etc/nodepool/nodepool.yaml" sed "s%MYSQL_PASS=MYSQL_ROOT_PASSWORD%MYSQL_PASS=$MYSQL_ROOT_PASSWORD%g" -i $WORKSPACE/config/nodepool/scripts/prepare_node.sh sed "s%JENKINS_PUBLIC_KEY%$JENKINS_PUBLIC_KEY%g" -i $WORKSPACE/config/nodepool/scripts/prepare_node.sh