From fb7723ff1fbaff5111c71ec0f48ed38a2c5aa48c Mon Sep 17 00:00:00 2001 From: Evgeny Sikachev Date: Fri, 5 Feb 2016 17:18:36 +0300 Subject: [PATCH] Add spark 1.6.0 Add jobs for spark 1.6.0 in sahara, sahara-scenario, sahara-image-elements Change-Id: I72c6242d6ba8fec9f0634e1637db5b52adb5b129 --- config/zuul/layout.yaml | 7 +++++++ jenkins_job_builder/diskimage.yaml | 1 + jenkins_job_builder/sahara.yaml | 1 + slave-scripts/dib.sh | 8 ++++++++ slave-scripts/functions-dib.sh | 3 +++ slave-scripts/gate-sahara.sh | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index 54528d42..e6f4014a 100644 --- a/config/zuul/layout.yaml +++ b/config/zuul/layout.yaml @@ -37,6 +37,7 @@ projects: - gate-sahara-neutron-heat-vanilla_2.7.1-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-spark_1.6.0-u14-aio - gate-sahara-neutron-heat-transient-u14 - gate-sahara-neutron-heat-mapr_5.0.0.mrv2-u14 - gate-sahara-nova-direct-cdh_5.3.0-u12-aio @@ -54,6 +55,7 @@ projects: - gate-sahara_tests-neutron-heat-vanilla_2.7.1-u14 - gate-sahara_tests-neutron-direct-spark_1.0.0-u14-aio - gate-sahara_tests-neutron-direct-spark_1.3.1-u14-aio + - gate-sahara_tests-neutron-direct-spark_1.6.0-u14-aio - gate-sahara_tests-neutron-heat-transient-u14 - gate-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14 - gate-sahara_tests-nova-direct-cdh_5.3.0-u12-aio @@ -83,6 +85,7 @@ projects: - dib-neutron-heat-mapr_5.0.0.mrv2-u14 - dib-neutron-direct-spark_1.0.0-u14-aio - dib-neutron-direct-spark_1.3.1-u14-aio + - dib-neutron-direct-spark_1.6.0-u14-aio - dib-nova-heat-hdp_2.0.6-c6.6 - dib-nova-heat-ambari_2.1-c6.6 - dib-nova-direct-cdh_5.3.0-u12-aio @@ -98,6 +101,7 @@ projects: - dib-neutron-heat-mapr_5.0.0.mrv2-u14 - dib-neutron-direct-spark_1.0.0-u14-aio - dib-neutron-direct-spark_1.3.1-u14-aio + - dib-neutron-direct-spark_1.6.0-u14-aio - dib-nova-heat-hdp_2.0.6-c6.6 - dib-nova-heat-ambari_2.1-c6.6 - dib-nova-direct-cdh_5.3.0-u12-aio @@ -138,6 +142,9 @@ jobs: branch: ^(master|stable/liberty)$ - name: ^.*-spark_1.0.0-.*$ branch: stable/kilo + - name: ^.*-spark_1.6.0-.*$ + branch: master + voting: false - name: ^.*-vanilla_2.7.1-.*$ branch: ^(master|stable/liberty)$ - name: dib-neutron-heat-vanilla_2.7.1-c6.6 diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml index 18841b0d..e1632709 100644 --- a/jenkins_job_builder/diskimage.yaml +++ b/jenkins_job_builder/diskimage.yaml @@ -55,6 +55,7 @@ plugin: - spark_1.0.0 - spark_1.3.1 + - spark_1.6.0 os: u14 - 'dib-{network}-{engine}-{plugin}-{os}': plugin: mapr_5.0.0.mrv2 diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index 77156b59..a3e3830a 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/jenkins_job_builder/sahara.yaml @@ -104,6 +104,7 @@ plugin: - spark_1.0.0 - spark_1.3.1 + - spark_1.6.0 os: u14 network: neutron - 'gate-{project_name}-{network}-{engine}-{plugin}-{os}': diff --git a/slave-scripts/dib.sh b/slave-scripts/dib.sh index 4c9bc00a..b2321c60 100755 --- a/slave-scripts/dib.sh +++ b/slave-scripts/dib.sh @@ -85,6 +85,14 @@ case $plugin in template_image_prefix="spark_1_3" ;; + spark_1.6.0) + env ubuntu_spark_image_name=${spark_1_6_0_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p spark -s 1.6 + check_error_code $? ${spark_1_6_0_image}.qcow2 + upload_image "${plugin}" "${username}" ${spark_1_6_0_image} + scenario_conf_file="$sahara_templates_path/spark-1.6.0.yaml.mako" + template_image_prefix="spark_1_6" + ;; + hdp_2.0.6) env centos_hdp_hadoop_2_image_name=${hdp_2_0_6_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p hdp -v 2 check_error_code $? ${hdp_2_0_6_image}.qcow2 diff --git a/slave-scripts/functions-dib.sh b/slave-scripts/functions-dib.sh index 00ff28a0..38faaf0f 100755 --- a/slave-scripts/functions-dib.sh +++ b/slave-scripts/functions-dib.sh @@ -78,6 +78,9 @@ upload_image() { spark_1.3.1) image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.3.1=True --property _sahara_username=${username}" ;; + spark_1.6.0) + image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.6.0=True --property _sahara_username=${username}" + ;; mapr_5.0.0.mrv2) image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.0.0.mrv2=True --property _sahara_username=${username}" ;; diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh index 5bea67e7..045e3c70 100755 --- a/slave-scripts/gate-sahara.sh +++ b/slave-scripts/gate-sahara.sh @@ -76,6 +76,10 @@ case $plugin in scenario_conf_file="$sahara_templates_path/spark-1.3.1.yaml.mako" template_image_prefix="spark_1_3" ;; + spark_1.6.0) + scenario_conf_file="$sahara_templates_path/spark-1.6.0.yaml.mako" + template_image_prefix="spark_1_6" + ;; mapr_5.0.0.mrv2) mode=distribute scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"