x/sahara-ci-config
Code Issues Proposed changes

Add spark 1.6.0

Browse Source 
Add jobs for spark 1.6.0 in sahara, sahara-scenario,
sahara-image-elements

Change-Id: I72c6242d6ba8fec9f0634e1637db5b52adb5b129
This commit is contained in:
Evgeny Sikachev 2016-02-05 17:18:36 +03:00
parent ac7591781c
commit fb7723ff1f
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/zuul/layout.yaml
View File

@ -37,6 +37,7 @@ projects:
- gate-sahara-neutron-heat-vanilla_2.7.1-u14 - 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.0.0-u14-aio
- gate-sahara-neutron-direct-spark_1.3.1-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-transient-u14
- gate-sahara-neutron-heat-mapr_5.0.0.mrv2-u14 - gate-sahara-neutron-heat-mapr_5.0.0.mrv2-u14
- gate-sahara-nova-direct-cdh_5.3.0-u12-aio - 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-heat-vanilla_2.7.1-u14
- gate-sahara_tests-neutron-direct-spark_1.0.0-u14-aio - 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.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-transient-u14
- gate-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14 - gate-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14
- gate-sahara_tests-nova-direct-cdh_5.3.0-u12-aio - 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-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio - dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-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-hdp_2.0.6-c6.6
- dib-nova-heat-ambari_2.1-c6.6 - dib-nova-heat-ambari_2.1-c6.6
- dib-nova-direct-cdh_5.3.0-u12-aio - 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-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio - dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-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-hdp_2.0.6-c6.6
- dib-nova-heat-ambari_2.1-c6.6 - dib-nova-heat-ambari_2.1-c6.6
- dib-nova-direct-cdh_5.3.0-u12-aio - dib-nova-direct-cdh_5.3.0-u12-aio
@ -138,6 +142,9 @@ jobs:
branch: ^(master|stable/liberty)$ branch: ^(master|stable/liberty)$
- name: ^.*-spark_1.0.0-.*$ - name: ^.*-spark_1.0.0-.*$
branch: stable/kilo branch: stable/kilo
- name: ^.*-spark_1.6.0-.*$
branch: master
voting: false
- name: ^.*-vanilla_2.7.1-.*$ - name: ^.*-vanilla_2.7.1-.*$
branch: ^(master|stable/liberty)$ branch: ^(master|stable/liberty)$
- name: dib-neutron-heat-vanilla_2.7.1-c6.6 - name: dib-neutron-heat-vanilla_2.7.1-c6.6

1
jenkins_job_builder/diskimage.yaml
View File

@ -55,6 +55,7 @@
plugin: plugin:
- spark_1.0.0 - spark_1.0.0
- spark_1.3.1 - spark_1.3.1
- spark_1.6.0
os: u14 os: u14
- 'dib-{network}-{engine}-{plugin}-{os}': - 'dib-{network}-{engine}-{plugin}-{os}':
plugin: mapr_5.0.0.mrv2 plugin: mapr_5.0.0.mrv2

1
jenkins_job_builder/sahara.yaml
View File

@ -104,6 +104,7 @@
plugin: plugin:
- spark_1.0.0 - spark_1.0.0
- spark_1.3.1 - spark_1.3.1
- spark_1.6.0
os: u14 os: u14
network: neutron network: neutron
- 'gate-{project_name}-{network}-{engine}-{plugin}-{os}': - 'gate-{project_name}-{network}-{engine}-{plugin}-{os}':

8
slave-scripts/dib.sh
View File

@ -85,6 +85,14 @@ case $plugin in
template_image_prefix="spark_1_3" 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) 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 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 check_error_code $? ${hdp_2_0_6_image}.qcow2

3
slave-scripts/functions-dib.sh
View File

@ -78,6 +78,9 @@ upload_image() {
spark_1.3.1) spark_1.3.1)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.3.1=True --property _sahara_username=${username}" 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) mapr_5.0.0.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.0.0.mrv2=True --property _sahara_username=${username}" image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.0.0.mrv2=True --property _sahara_username=${username}"
;; ;;

4
slave-scripts/gate-sahara.sh
View File

@ -76,6 +76,10 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/spark-1.3.1.yaml.mako" scenario_conf_file="$sahara_templates_path/spark-1.3.1.yaml.mako"
template_image_prefix="spark_1_3" 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) mapr_5.0.0.mrv2)
mode=distribute mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako" scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"