Support vanilla 2.7.1 testing on CI

Implements blueprint: support-vanilla-2-7-1

Change-Id: Iadd4471e28dea00ebfe9c9774fcf3470bbb1a0de

config/devstack/local.sh

@@ -25,6 +25,7 @@ else
 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
 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
@@ -73,6 +74,7 @@ source $ADMIN_RCFILE ci-user ci
 
 # add images for tests
 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 --is-public=true --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 --is-public=true --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 --is-public=true --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 $CENTOS_CDH_5_3_0_IMAGE_PATH) --file $CENTOS_CDH_5_3_0_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --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 --is-public=true --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"

config/zuul/layout.yaml

@@ -28,6 +28,7 @@ projects:
   - name: openstack/sahara
     check:
       - gate-sahara-neutron-heat-vanilla_2.6.0-u14
+      - gate-sahara-neutron-heat-vanilla_2.7.0-u14
       - gate-sahara-neutron-direct-spark_1.0.0-u14-aio
       - gate-sahara-neutron-direct-spark_1.3.1-u14-aio
       - gate-sahara-neutron-direct-transient-u14
@@ -51,6 +52,8 @@ projects:
     check:
       - dib-neutron-heat-vanilla_2.6.0-u14
       - dib-neutron-heat-vanilla_2.6.0-c6.6
+      - dib-neutron-heat-vanilla_2.7.1-u14
+      - dib-neutron-heat-vanilla_2.7.1-c6.6
       - dib-neutron-heat-vanilla_2.6.0-c7
       - dib-neutron-heat-mapr_4.0.2.mrv2-u14
       - dib-neutron-direct-spark_1.0.0-u14-aio
@@ -63,6 +66,8 @@ projects:
     post:
       - dib-neutron-heat-vanilla_2.6.0-u14
       - dib-neutron-heat-vanilla_2.6.0-c6.6
+      - dib-neutron-heat-vanilla_2.7.1-u14
+      - dib-neutron-heat-vanilla_2.7.1-c6.6
       - dib-neutron-heat-vanilla_2.6.0-c7
       - dib-neutron-heat-mapr_4.0.2.mrv2-u14
       - dib-neutron-direct-spark_1.0.0-u14-aio
@@ -102,6 +107,9 @@ jobs:
     branch: master
   - name: ^.*-spark_1.0.0-.*$
     branch: stable/kilo
+  - name: ^.*-vanilla_2.7.1-.*$
+    branch: master
+    voting: false
   - name: dib-neutron-heat-vanilla_2.6.0-c7
     branch: master
     voting: false

jenkins_job_builder/diskimage.yaml

@@ -33,7 +33,9 @@
     github-org: openstack
     network: neutron
     engine: heat
-    plugin: vanilla_2.6.0
+    plugin:
+      - vanilla_2.6.0
+      - vanilla_2.7.1
     os:
      - u14
      - c6.6

jenkins_job_builder/sahara.yaml

@@ -77,6 +77,7 @@
           engine: heat
           plugin:
              - vanilla_2.6.0
+             - vanilla_2.7.1
              - transient
              - mapr_4.0.2.mrv2
           os: u14

slave-scripts/dib.sh

@@ -56,6 +56,14 @@ case $plugin in
        scenario_conf_file="$sahara_templates_path/vanilla-2.6.0.yaml.mako"
        template_image_prefix="vanilla_two_six"
     ;;
+    vanilla_2.7.1)
+      env ${os_type}_vanilla_hadoop_2_7_1_image_name=${vanilla_2_7_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p vanilla -i $os_type -v 2.7.1
+      check_error_code $? ${vanilla_2_7_1_image}.qcow2
+      upload_image "${plugin}" "${username}" ${vanilla_2_7_1_image}
+      mode=distribute
+      scenario_conf_file="$sahara_templates_path/vanilla-2.7.1.yaml.mako"
+      template_image_prefix="vanilla_two_seven_one"
+    ;;
 
     spark_1.0.0)
        env ubuntu_spark_image_name=${spark_1_0_0_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p spark -s 1.0.2

slave-scripts/functions-dib.sh

@@ -53,6 +53,9 @@ upload_image() {
            vanilla_2.6.0)
              image_properties="--property _sahara_tag_2.6.0=True --property _sahara_tag_vanilla=True --property _sahara_username=${username}"
            ;;
+           vanilla_2.7.1)
+             image_properties="--property _sahara_tag_2.7.1=True --property _sahara_tag_vanilla=True --property _sahara_username=${username}"
+           ;;
            hdp_2.0.6)
              image_properties="--property _sahara_tag_2.0.6=True --property _sahara_tag_hdp=True --property _sahara_username=${username}"
            ;;

slave-scripts/gate-sahara.sh

@@ -30,6 +30,11 @@ case $plugin in
        scenario_conf_file="$sahara_templates_path/vanilla-2.6.0.yaml.mako"
        template_image_prefix="vanilla_two_six"
        ;;
+    vanilla_2.7.1)
+       mode=distribute
+       scenario_conf_file="$sahara_templates_path/vanilla-2.7.1.yaml.mako"
+       template_image_prefix="vanilla_two_seven_one"
+    ;;
     transient)
        # transient is using image with latest vanilla version
        image_name=vanilla_2.6.0_u14