x/sahara-ci-config
Code Issues Proposed changes

Add CDH 5.5.0 to sahara-ci

Browse Source 
Added jobs for cdh-5.5.0, ubuntu and centos

Change-Id: Ic495425d270be0b5bd2b16d59bc999929cda34f3
This commit is contained in:
Evgeny Sikachev 2016-02-17 13:38:12 +03:00
parent 70925de68c
commit 11c94448d8
6 changed files with 28 additions and 0 deletions

11
config/zuul/layout.yaml

@ -44,6 +44,8 @@ projects:
- gate-sahara-nova-direct-cdh_5.3.0-c6.6-aio
- gate-sahara-nova-direct-cdh_5.4.0-u12-aio
- gate-sahara-nova-direct-cdh_5.4.0-c6.6-aio
- gate-sahara-nova-direct-cdh_5.5.0-u12-aio
- gate-sahara-nova-direct-cdh_5.5.0-c6.6-aio
- gate-sahara-nova-heat-hdp_2.0.6-c6.6
- gate-sahara-nova-heat-ambari_2.3-c6.6
- gate-sahara-pep8-trunk
@ -62,6 +64,8 @@ projects:
- gate-sahara_tests-nova-direct-cdh_5.3.0-c6.6-aio
- gate-sahara_tests-nova-direct-cdh_5.4.0-u12-aio
- gate-sahara_tests-nova-direct-cdh_5.4.0-c6.6-aio
- gate-sahara_tests-nova-direct-cdh_5.5.0-u12-aio
- gate-sahara_tests-nova-direct-cdh_5.5.0-c6.6-aio
- gate-sahara_tests-nova-heat-hdp_2.0.6-c6.6
- gate-sahara_tests-nova-heat-ambari_2.3-c6.6
- gate-sahara_tests-nova-direct-cdh_5.4.0-u12-liberty
@ -92,6 +96,8 @@ projects:
- dib-nova-direct-cdh_5.3.0-c6.6-aio
- dib-nova-direct-cdh_5.4.0-u12-aio
- dib-nova-direct-cdh_5.4.0-c6.6-aio
- dib-nova-direct-cdh_5.5.0-u12-aio
- dib-nova-direct-cdh_5.5.0-c6.6-aio
post:
- dib-neutron-heat-vanilla_2.6.0-u14
- dib-neutron-heat-vanilla_2.6.0-c6.6
@ -108,6 +114,8 @@ projects:
- dib-nova-direct-cdh_5.3.0-c6.6-aio
- dib-nova-direct-cdh_5.4.0-u12-aio
- dib-nova-direct-cdh_5.4.0-c6.6-aio
- dib-nova-direct-cdh_5.5.0-u12-aio
- dib-nova-direct-cdh_5.5.0-c6.6-aio
- name: openstack/sahara-ci-config
check:
@ -146,6 +154,9 @@ jobs:
- name: ^.*-spark_1.6.0-.*$
branch: master
voting: false
- name: ^.*-cdh_5.5.0-.*$
branch: master
voting: false
- name: ^.*-vanilla_2.7.1-.*$
branch: ^(master|stable/liberty)$
- name: dib-neutron-heat-vanilla_2.7.1-c6.6

1
jenkins_job_builder/diskimage.yaml

@ -47,6 +47,7 @@
plugin:
- cdh_5.3.0
- cdh_5.4.0
- cdh_5.5.0
os:
- u12
- c6.6

1
jenkins_job_builder/sahara.yaml

@ -86,6 +86,7 @@
plugin:
- cdh_5.3.0
- cdh_5.4.0
- cdh_5.5.0
os:
- u12
- c6.6

8
slave-scripts/dib.sh

@ -118,6 +118,14 @@ case $plugin in
template_image_prefix="cdh_5_4_0"
;;
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
upload_image "${plugin}" "${username}" ${cdh_5_5_0_image}
scenario_conf_file="$sahara_templates_path/cdh-5.5.0.yaml.mako"
template_image_prefix="cdh_5_5_0"
;;
ambari_2.1)
env ambari_${os_type}_image_name=${ambari_2_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type -v 2.1.0
check_error_code $? ${ambari_2_1_image}.qcow2

3
slave-scripts/functions-dib.sh

@ -72,6 +72,9 @@ upload_image() {
cdh_5.4.0)
image_properties="--property _sahara_tag_5.4.0=True --property _sahara_tag_cdh=True --property _sahara_username=${username}"
;;
cdh_5.5.0)
image_properties="--property _sahara_tag_5.5.0=True --property _sahara_tag_cdh=True --property _sahara_username=${username}"
;;
spark_1.0.0)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.0.0=True --property _sahara_username=${username}"
;;

4
slave-scripts/gate-sahara.sh

@ -68,6 +68,10 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/cdh-5.4.0.yaml.mako"
template_image_prefix="cdh_5_4_0"
;;
cdh_5.5.0)
scenario_conf_file="$sahara_templates_path/cdh-5.5.0.yaml.mako"
template_image_prefix="cdh_5_5_0"
;;
spark_1.0.0)
scenario_conf_file="$sahara_templates_path/spark-1.0.0.yaml.mako"
template_image_prefix="spark"