Merge "Adding of spark 2.1.0 on sahara-ci"

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_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
 STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
@@ -95,6 +96,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_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"
 openstack image create $(basename -s .qcow2 $STORM_1_0_1_IMAGE_PATH) --file $STORM_1_0_1_IMAGE_PATH --disk-format qcow2 --container-format bare  --property '_sahara_tag_ci'='True' --property '_sahara_tag_storm'='True' --property '_sahara_tag_1.0.1'='True'  --property '_sahara_username'="ubuntu"

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_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
 STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
@@ -44,6 +45,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_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)
 openstack image save --file $STORM_1_0_1_IMAGE_PATH $(get_id $STORM_1_0_1_IMAGE_PATH)

config/zuul/layout.yaml

@@ -72,6 +72,7 @@ projects:
       - gate-sahara-vanilla_2.7.1-u14
       - gate-sahara-spark_1.6.0-u14
       - gate-sahara-spark_1.6.0-u14-python3
+      - gate-sahara-spark_2.1.0-u14
       - gate-sahara-mapr_5.1.0.mrv2-u14
       - gate-sahara-mapr_5.2.0.mrv2-u14
       - gate-sahara-cdh_5.5.0-u14
@@ -91,6 +92,7 @@ projects:
     check:
       - gate-sahara_tests-vanilla_2.7.1-u14
       - gate-sahara_tests-spark_1.6.0-u14
+      - gate-sahara_tests-spark_2.1.0-u14
       - gate-sahara_tests-mapr_5.1.0.mrv2-u14
       - gate-sahara_tests-mapr_5.2.0.mrv2-u14
       - gate-sahara_tests-cdh_5.5.0-u14
@@ -208,6 +210,17 @@ jobs:
       - ^sahara_tests/.*.py$
       - ^diskimage-create/.*$
       - ^elements/.*$
+  - name: ^(?!nightly).*-spark_2.1.0-.*$
+    skip-if:
+      - branch: ^(stable/newton|stable/mitaka)$
+    files:
+      - ^sahara_tests/scenario/defaults/spark-2.1.0.*$
+      - ^sahara_tests/scenario/defaults/edp.yaml.mako$
+      - ^sahara_tests/scenario/defaults/edp-examples/.*$
+      - ^sahara/.*$
+      - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-cdh_5.5.0-.*$
     skip-if:
       - branch: ^(stable/newton|master)$

jenkins_job_builder/diskimage.yaml

@@ -30,6 +30,7 @@
       - 'dib-{plugin}-{os}':
           plugin:
             - spark_1.6.0
+            - spark_2.1.0
             - storm_1.0.1
             - storm_1.1.0
             - mapr_5.1.0.mrv2

jenkins_job_builder/sahara.yaml

@@ -47,6 +47,7 @@
              - mapr_5.1.0.mrv2
              - mapr_5.2.0.mrv2
              - spark_1.6.0
+             - spark_2.1.0
              - storm_1.0.1
              - storm_1.1.0
           os: u14

slave-scripts/dib.sh

@@ -66,6 +66,12 @@ case $plugin in
        upload_image "${plugin}" "${username}" "${spark_1_6_0_image:?}"
     ;;
 
+    spark_2.1.0)
+       env ubuntu_spark_image_name="${spark_2_1_0_image:?}" SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p spark -s 2.1.0
+       check_error_code $? "${spark_2_1_0_image:?}".qcow2
+       upload_image "${plugin}" "${username}" "${spark_2_1_0_image:?}"
+    ;;
+
     cdh_5.5.0)
        env cloudera_5_5_${os_type}_image_name="${cdh_5_5_0_image:?}" SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p cloudera -i $os_type -v 5.5
        check_error_code $? "${cdh_5_5_0_image:?}".qcow2

slave-scripts/functions-dib.sh

@@ -74,6 +74,9 @@ upload_image() {
            spark_1.6.0)
              image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.6.0=True --property _sahara_username=${username}"
            ;;
+           spark_2.1.0)
+             image_properties="--property _sahara_tag_spark=True --property _sahara_tag_2.1.0=True --property _sahara_username=${username}"
+           ;;
            mapr_5.1.0.mrv2)
              image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.1.0.mrv2=True --property _sahara_username=${username}"
            ;;