x
/
sahara-ci-config
Code Issues Proposed changes

Merge "Add jobs for CDH 5.9 c7 and u14"

This commit is contained in:
Jenkins 2017-01-13 09:30:22 +00:00 committed by Gerrit Code Review
parent 79f62ee253 cf5a3200b5
commit 723505b358
7 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/devstack/local.sh
View File

@ -30,8 +30,10 @@ UBUNTU_AMBARI_2_2_IMAGE_PATH=/home/ubuntu/images/ambari_2.2_u14.qcow2
UBUNTU_CDH_5_5_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.5.0_u14.qcow2
CENTOS_CDH_5_5_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.5.0_c6.6.qcow2
CENTOS7_CDH_5_5_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.5.0_c7.qcow2
CENTOS7_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_c7.qcow2
UBUNTU_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_u14.qcow2
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
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
@ -89,6 +91,8 @@ openstack image create $(basename -s .qcow2 $CENTOS_CDH_5_5_0_IMAGE_PATH) --file
openstack image create $(basename -s .qcow2 $CENTOS7_CDH_5_5_0_IMAGE_PATH) --file $CENTOS7_CDH_5_5_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.5.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="centos"
openstack image create $(basename -s .qcow2 $CENTOS7_CDH_5_7_0_IMAGE_PATH) --file $CENTOS7_CDH_5_7_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.7.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="centos"
openstack image create $(basename -s .qcow2 $UBUNTU_CDH_5_7_0_IMAGE_PATH) --file $UBUNTU_CDH_5_7_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.7.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="ubuntu"
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 $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"

6
config/devstack/pre_unstack.sh
View File

@ -22,8 +22,10 @@ UBUNTU_AMBARI_2_2_IMAGE_PATH=/home/ubuntu/images/ambari_2.2_u14.qcow2
UBUNTU_CDH_5_5_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.5.0_u14.qcow2
CENTOS_CDH_5_5_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.5.0_c6.6.qcow2
CENTOS7_CDH_5_5_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.5.0_c7.qcow2
CENTOS7_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_c7.qcow2
UBUNTU_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_u14.qcow2
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
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
@ -38,6 +40,8 @@ openstack image save --file $CENTOS_CDH_5_5_0_IMAGE_PATH $(get_id $CENTOS_CDH_5_
openstack image save --file $CENTOS7_CDH_5_5_0_IMAGE_PATH $(get_id $CENTOS7_CDH_5_5_0_IMAGE_PATH)
openstack image save --file $CENTOS7_CDH_5_7_0_IMAGE_PATH $(get_id $CENTOS7_CDH_5_7_0_IMAGE_PATH)
openstack image save --file $UBUNTU_CDH_5_7_0_IMAGE_PATH $(get_id $UBUNTU_CDH_5_7_0_IMAGE_PATH)
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 $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)

20
config/zuul/layout.yaml
View File

@ -78,6 +78,8 @@ projects:
- gate-sahara-cdh_5.5.0-c7
- gate-sahara-cdh_5.7.0-c7
- gate-sahara-cdh_5.7.0-u14
- gate-sahara-cdh_5.9.0-c7
- gate-sahara-cdh_5.9.0-u14
- gate-sahara-storm_1.0.1-u14
- gate-sahara-ambari_2.3-c7
- gate-sahara-ambari_2.4-c7
@ -94,6 +96,8 @@ projects:
- gate-sahara_tests-cdh_5.5.0-c7
- gate-sahara_tests-cdh_5.7.0-c7
- gate-sahara_tests-cdh_5.7.0-u14
- gate-sahara_tests-cdh_5.9.0-c7
- gate-sahara_tests-cdh_5.9.0-u14
- gate-sahara_tests-ambari_2.3-c7
- gate-sahara_tests-ambari_2.4-c7
- gate-sahara_tests-ambari_2.4-u14
@ -129,6 +133,8 @@ projects:
- dib-cdh_5.5.0-c7
- dib-cdh_5.7.0-c7
- dib-cdh_5.7.0-u14
- dib-cdh_5.9.0-c7
- dib-cdh_5.9.0-u14
- dib-storm_1.0.1-u14
- dib-ambari_2.2-c7
- dib-ambari_2.2-u14
@ -141,6 +147,8 @@ projects:
- dib-cdh_5.5.0-u14
- dib-cdh_5.5.0-c7
- dib-cdh_5.7.0-c7
- dib-cdh_5.9.0-c7
- dib-cdh_5.9.0-u14
- dib-storm_1.0.1-u14
- dib-ambari_2.2-c7
- dib-ambari_2.2-u14
@ -219,6 +227,18 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-cdh_5.9.0-.*$
skip-if:
- branch: ^(stable/liberty|stable/mitaka|stable/newton)$
voting: false
files:
- ^sahara_tests/scenario/defaults/cdh-5.9.*$
- ^sahara_tests/scenario/defaults/edp.yaml.mako$
- ^sahara_tests/scenario/defaults/edp-examples/.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly|weekly).*-vanilla_2.7.1-.*$
files:
- ^sahara_tests/scenario/defaults/vanilla-2.7.1.*$

1
jenkins_job_builder/diskimage.yaml
View File

@ -20,6 +20,7 @@
- vanilla_2.7.1
- cdh_5.5.0
- cdh_5.7.0
- cdh_5.9.0
- ambari_2.2
os:
- u14

1
jenkins_job_builder/sahara.yaml
View File

@ -53,6 +53,7 @@
plugin:
- cdh_5.5.0
- cdh_5.7.0
- cdh_5.9.0
- ambari_2.4
- '{pipeline}-{project_name}-{plugin}-{os}-{param}':
project_name: sahara_tests

6
slave-scripts/dib.sh
View File

@ -78,6 +78,12 @@ case $plugin in
upload_image "${plugin}" "${username}" "${cdh_5_7_0_image:?}"
;;
cdh_5.9.0)
env cloudera_5_9_${os_type}_image_name="${cdh_5_9_0_image:?}" SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p cloudera -i $os_type -v 5.9
check_error_code $? "${cdh_5_9_0_image:?}".qcow2
upload_image "${plugin}" "${username}" "${cdh_5_9_0_image:?}"
;;
ambari_2.2)
env ambari_${os_type}_image_name="${ambari_2_2_image:?}" SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type
check_error_code $? "${ambari_2_2_image:?}".qcow2

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

@ -68,6 +68,9 @@ upload_image() {
cdh_5.7.0)
image_properties="--property _sahara_tag_5.7.0=True --property _sahara_tag_cdh=True --property _sahara_username=${username}"
;;
cdh_5.9.0)
image_properties="--property _sahara_tag_5.9.0=True --property _sahara_tag_cdh=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}"
;;