From 2d8ba9bea8afed41971bd79109bc30bbdb266492 Mon Sep 17 00:00:00 2001 From: Evgeny Sikachev Date: Mon, 10 Apr 2017 15:13:02 +0400 Subject: [PATCH] Adding image for spark form mitaka We need to use another image, not spark from the master. The images was added on slaves. Change-Id: I6cc7ad9d5d1dbe5727216315df407dab200bb084 --- config/devstack/local.sh | 2 ++ config/devstack/pre_unstack.sh | 2 ++ config/zuul/layout.yaml | 1 - slave-scripts/gate-sahara.sh | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/devstack/local.sh b/config/devstack/local.sh index 862cbde0..32d2edc3 100755 --- a/config/devstack/local.sh +++ b/config/devstack/local.sh @@ -35,6 +35,7 @@ CENTOS7_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_c7.qcow2 UBUNTU_CDH_5_9_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.9.0_u14.qcow2 CENTOS7_CDH_5_9_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.9.0_c7.qcow2 SPARK_1_6_0_IMAGE_PATH=/home/ubuntu/images/spark_1.6.0_u14.qcow2 +SPARK_1_6_0_MITAKA_IMAGE_PATH=/home/ubuntu/images/spark_1.6.0_u14_mitaka.qcow2 SPARK_2_1_0_IMAGE_PATH=/home/ubuntu/images/spark_2.1.0_u14.qcow2 MAPR_5_1_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.1.0.mrv2_u14.qcow2 MAPR_5_2_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.2.0.mrv2_u14.qcow2 @@ -96,6 +97,7 @@ openstack image create $(basename -s .qcow2 $UBUNTU_CDH_5_7_0_IMAGE_PATH) --file openstack image create $(basename -s .qcow2 $CENTOS7_CDH_5_9_0_IMAGE_PATH) --file $CENTOS7_CDH_5_9_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.9.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="centos" openstack image create $(basename -s .qcow2 $UBUNTU_CDH_5_9_0_IMAGE_PATH) --file $UBUNTU_CDH_5_9_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.9.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="ubuntu" openstack image create $(basename -s .qcow2 $SPARK_1_6_0_IMAGE_PATH) --file $SPARK_1_6_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.6.0'='True' --property '_sahara_username'="ubuntu" +openstack image create $(basename -s .qcow2 $SPARK_1_6_0_MITAKA_IMAGE_PATH) --file $SPARK_1_6_0_MITAKA_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.6.0'='True' --property '_sahara_username'="ubuntu" openstack image create $(basename -s .qcow2 $SPARK_2_1_0_IMAGE_PATH) --file $SPARK_2_1_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_2.1.0'='True' --property '_sahara_username'="ubuntu" openstack image create $(basename -s .qcow2 $MAPR_5_1_0_MRV2_IMAGE_PATH) --file $MAPR_5_1_0_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_5.1.0.mrv2'='True' --property '_sahara_username'="ubuntu" openstack image create $(basename -s .qcow2 $MAPR_5_2_0_MRV2_IMAGE_PATH) --file $MAPR_5_2_0_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_5.2.0.mrv2'='True' --property '_sahara_username'="ubuntu" diff --git a/config/devstack/pre_unstack.sh b/config/devstack/pre_unstack.sh index 983ca39d..0ab88316 100755 --- a/config/devstack/pre_unstack.sh +++ b/config/devstack/pre_unstack.sh @@ -27,6 +27,7 @@ CENTOS7_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_c7.qcow2 UBUNTU_CDH_5_9_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.9.0_u14.qcow2 CENTOS7_CDH_5_9_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.9.0_c7.qcow2 SPARK_1_6_0_IMAGE_PATH=/home/ubuntu/images/spark_1.6.0_u14.qcow2 +SPARK_1_6_0_MITAKA_IMAGE_PATH=/home/ubuntu/images/spark_1.6.0_u14_mitaka.qcow2 SPARK_2_1_0_IMAGE_PATH=/home/ubuntu/images/spark_2.1.0_u14.qcow2 MAPR_5_1_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.1.0.mrv2_u14.qcow2 MAPR_5_2_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.2.0.mrv2_u14.qcow2 @@ -45,6 +46,7 @@ openstack image save --file $UBUNTU_CDH_5_7_0_IMAGE_PATH $(get_id $UBUNTU_CDH_5_ openstack image save --file $CENTOS7_CDH_5_9_0_IMAGE_PATH $(get_id $CENTOS7_CDH_5_9_0_IMAGE_PATH) openstack image save --file $UBUNTU_CDH_5_9_0_IMAGE_PATH $(get_id $UBUNTU_CDH_5_9_0_IMAGE_PATH) openstack image save --file $SPARK_1_6_0_IMAGE_PATH $(get_id $SPARK_1_6_0_IMAGE_PATH) +openstack image save --file $SPARK_1_6_0_MITAKA_IMAGE_PATH $(get_id $SPARK_1_6_0_MITAKA_IMAGE_PATH) openstack image save --file $SPARK_2_1_0_IMAGE_PATH $(get_id $SPARK_2_1_0_IMAGE_PATH) openstack image save --file $MAPR_5_1_0_MRV2_IMAGE_PATH $(get_id $MAPR_5_1_0_MRV2_IMAGE_PATH) openstack image save --file $MAPR_5_2_0_MRV2_IMAGE_PATH $(get_id $MAPR_5_2_0_MRV2_IMAGE_PATH) diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index 60c22804..9c224c2b 100644 --- a/config/zuul/layout.yaml +++ b/config/zuul/layout.yaml @@ -198,7 +198,6 @@ jobs: - ^diskimage-create/.*$ - ^elements/.*$ - name: ^(?!nightly).*-spark_1.6.0-.*$ - voting: false files: - ^sahara_tests/scenario/defaults/spark-1.6.0.*$ - ^sahara_tests/scenario/defaults/mitaka/spark-1.6.0.*$ diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh index 445f8767..5d74e6ce 100755 --- a/slave-scripts/gate-sahara.sh +++ b/slave-scripts/gate-sahara.sh @@ -39,6 +39,11 @@ case $plugin in # the only job to test aio approach mode="aio" ;; + spark_1.6.0) + if [ "$ZUUL_BRANCH" == "stable/mitaka" ]; then + image_name="spark_1.6.0_u14_mitaka" + fi + ;; esac upper_constraints="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"