From b0019a6647121c0c617e2e23c7ee7acd851bb646 Mon Sep 17 00:00:00 2001 From: Evgeny Sikachev Date: Mon, 28 Sep 2015 14:54:53 +0300 Subject: [PATCH] Adding ambari-2.3 centos job for sahara ci Adding non-voting job for testing ambari 2.3 Change-Id: I4bc758a7b48ecd37cbf1ed2a6efe17eddd56a9b5 --- config/devstack/local.sh | 2 ++ config/zuul/layout.yaml | 6 ++++-- jenkins_job_builder/diskimage.yaml | 9 +++------ jenkins_job_builder/sahara.yaml | 4 +++- slave-scripts/gate-sahara.sh | 5 +++++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/config/devstack/local.sh b/config/devstack/local.sh index e53753b0..0f096a5b 100755 --- a/config/devstack/local.sh +++ b/config/devstack/local.sh @@ -27,6 +27,7 @@ fi VANILLA_2_6_0_IMAGE_PATH=/home/ubuntu/images/vanilla_2.6.0_u14.qcow2 VANILLA_2_7_1_IMAGE_PATH=/home/ubuntu/images/vanilla_2.7.1_u14.qcow2 HDP_2_0_6_IMAGE_PATH=/home/ubuntu/images/hdp_2.0.6_c6.6.qcow2 +AMBARI_2_3_IMAGE_PATH=/home/ubuntu/images/ambari_2.1_c6.6.qcow2 CENTOS_CDH_5_3_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.3.0_c6.6.qcow2 UBUNTU_CDH_5_3_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.3.0_u12.qcow2 UBUNTU_CDH_5_4_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.4.0_u12.qcow2 @@ -76,6 +77,7 @@ source $ADMIN_RCFILE ci-user ci glance image-create --name $(basename -s .qcow2 $VANILLA_2_6_0_IMAGE_PATH) --file $VANILLA_2_6_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.6.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu' glance image-create --name $(basename -s .qcow2 $VANILLA_2_7_1_IMAGE_PATH) --file $VANILLA_2_7_1_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.7.1'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu' glance image-create --name $(basename -s .qcow2 $HDP_2_0_6_IMAGE_PATH) --file $HDP_2_0_6_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.0.6'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'='cloud-user' +glance image-create --name $(basename -s .qcow2 $AMBARI_2_3_IMAGE_PATH) --file $AMBARI_2_3_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.3'='True' --property '_sahara_tag_ambari'='True' --property '_sahara_username'='cloud-user' glance image-create --name $(basename -s .qcow2 $CENTOS_CDH_5_3_0_IMAGE_PATH) --file $CENTOS_CDH_5_3_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.3.0'='True' --property '_sahara_tag_5'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="cloud-user" glance image-create --name $(basename -s .qcow2 $UBUNTU_CDH_5_3_0_IMAGE_PATH) --file $UBUNTU_CDH_5_3_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.3.0'='True' --property '_sahara_tag_5'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="ubuntu" glance image-create --name $(basename -s .qcow2 $UBUNTU_CDH_5_4_0_IMAGE_PATH) --file $UBUNTU_CDH_5_4_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.4.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="ubuntu" diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index 8947e6ba..9c09c5df 100644 --- a/config/zuul/layout.yaml +++ b/config/zuul/layout.yaml @@ -39,6 +39,7 @@ projects: - gate-sahara-nova-direct-cdh_5.4.0-u12-aio - gate-sahara-nova-direct-cdh_5.4.0-c6.6-aio - gate-sahara-nova-heat-hdp_2.0.6-c6.6 + - gate-sahara-nova-heat-ambari_2.3-c6.6 - gate-sahara-pep8-trunk - tempest-sahara-tests @@ -59,7 +60,6 @@ projects: - dib-neutron-direct-spark_1.0.0-u14-aio - dib-neutron-direct-spark_1.3.1-u14-aio - dib-nova-heat-hdp_2.0.6-c6.6 - - dib-nova-heat-ambari_2.1-u12 - dib-nova-heat-ambari_2.1-c6.6 - dib-nova-direct-cdh_5.3.0-u12-aio - dib-nova-direct-cdh_5.3.0-c6.6-aio @@ -75,7 +75,6 @@ projects: - dib-neutron-direct-spark_1.0.0-u14-aio - dib-neutron-direct-spark_1.3.1-u14-aio - dib-nova-heat-hdp_2.0.6-c6.6 - - dib-nova-heat-ambari_2.1-u12 - dib-nova-heat-ambari_2.1-c6.6 - dib-nova-direct-cdh_5.3.0-u12-aio - dib-nova-direct-cdh_5.3.0-c6.6-aio @@ -115,6 +114,9 @@ jobs: branch: stable/kilo - name: ^.*-vanilla_2.7.1-.*$ branch: master + - name: ^.*-ambari_2.3-.*$ + branch: master + voting: false - name: dib-neutron-heat-vanilla_2.7.1-c7 branch: master voting: false diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml index e17f23ec..829e34de 100644 --- a/jenkins_job_builder/diskimage.yaml +++ b/jenkins_job_builder/diskimage.yaml @@ -61,16 +61,13 @@ os: u14 - 'dib-{network}-{engine}-{plugin}-{os}': network: nova - plugin: ambari_2.1 + plugin: + - ambari_2.1 + - hdp_2.0.6 os: - - u12 - c6.6 - 'dib-{network}-{engine}-{plugin}-{os}': plugin: vanilla_2.6.0 os: - u14 - c6.6 - - 'dib-{network}-{engine}-{plugin}-{os}': - network: nova - plugin: hdp_2.0.6 - os: c6.6 diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index 531ea004..af9cff6a 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/jenkins_job_builder/sahara.yaml @@ -95,7 +95,9 @@ - 'gate-sahara-{network}-{engine}-{plugin}-{os}': network: nova engine: heat - plugin: hdp_2.0.6 + plugin: + - hdp_2.0.6 + - ambari_2.3 os: c6.6 - 'tempest-{name}-tests' diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh index 54c78578..0ed940ed 100755 --- a/slave-scripts/gate-sahara.sh +++ b/slave-scripts/gate-sahara.sh @@ -25,6 +25,11 @@ case $plugin in scenario_conf_file="$sahara_templates_path/hdp-2.0.6.yaml.mako" template_image_prefix="hdp_two" ;; + ambari_2.3) + mode=distribute + scenario_conf_file="$sahara_templates_path/ambari-2.3.yaml.mako" + template_image_prefix="ambari_2_1" + ;; vanilla_2.6.0) mode=distribute scenario_conf_file="$sahara_templates_path/vanilla-2.6.0.yaml.mako"