x/sahara-ci-config
Code Issues Proposed changes

Merge "Storm 1.1.0 was added on sahara-ci"

Browse Source
This commit is contained in:
Jenkins 2017-04-05 08:51:10 +00:00 committed by Gerrit Code Review
commit 367207e291
7 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/devstack/local.sh
View File

@ -38,6 +38,7 @@ 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
STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
STORM_1_1_0_IMAGE_PATH=/home/ubuntu/images/storm_1.1.0_u14.qcow2
export OS_CLOUD='devstack-admin'
@ -97,6 +98,7 @@ openstack image create $(basename -s .qcow2 $SPARK_1_6_0_IMAGE_PATH) --file $SPA
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"
openstack image create $(basename -s .qcow2 $STORM_1_1_0_IMAGE_PATH) --file $STORM_1_1_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_storm'='True' --property '_sahara_tag_1.1.0'='True' --property '_sahara_username'="ubuntu"
openstack image set --name ubuntu-16.04 xenial-server-cloudimg-amd64-disk1
# rename admin private network

3
config/devstack/pre_unstack.sh
View File

@ -30,6 +30,7 @@ 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
STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
STORM_1_1_0_IMAGE_PATH=/home/ubuntu/images/storm_1.1.0_u14.qcow2
openstack image save --file $VANILLA_2_7_1_IMAGE_PATH $(get_id $VANILLA_2_7_1_IMAGE_PATH)
@ -46,6 +47,6 @@ openstack image save --file $SPARK_1_6_0_IMAGE_PATH $(get_id $SPARK_1_6_0_IMAGE_
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)
openstack image save --file $STORM_1_1_0_IMAGE_PATH $(get_id $STORM_1_1_0_IMAGE_PATH)
bash $TOP_DIR/unstack.sh

16
config/zuul/layout.yaml
View File

@ -81,6 +81,7 @@ projects:
- gate-sahara-cdh_5.9.0-c7
- gate-sahara-cdh_5.9.0-u14
- gate-sahara-storm_1.0.1-u14
- gate-sahara-storm_1.1.0-u14
- gate-sahara-ambari_2.3-c7
- gate-sahara-ambari_2.4-c7
- gate-sahara-ambari_2.4-u14
@ -107,6 +108,7 @@ projects:
- gate-sahara_tests-spark_1.6.0-u14-python3
- gate-sahara_tests-vanilla_2.7.1-u14-mitaka
- gate-sahara_tests-storm_1.0.1-u14
- gate-sahara_tests-storm_1.1.0-u14
- gate-sahara_tests-ambari_2.3-c7-mitaka
nightly:
@ -136,6 +138,7 @@ projects:
- dib-cdh_5.9.0-c7
- dib-cdh_5.9.0-u14
- dib-storm_1.0.1-u14
- dib-storm_1.1.0-u14
- dib-ambari_2.2-c7
- dib-ambari_2.2-u14
post:
@ -150,6 +153,7 @@ projects:
- dib-cdh_5.9.0-c7
- dib-cdh_5.9.0-u14
- dib-storm_1.0.1-u14
- dib-storm_1.1.0-u14
- dib-ambari_2.2-c7
- dib-ambari_2.2-u14
@ -286,6 +290,18 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-storm_1.1.0-.*$
voting: false
skip-if:
- branch: stable/mitaka
files:
- ^sahara_tests/scenario/defaults/storm-1.1.0.*$
- ^sahara_tests/scenario/defaults/edp.yaml.mako$
- ^sahara_tests/scenario/defaults/edp-examples/.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: gate-.*-spark_1.6.0-u14-python3
voting: false
skip-if:

3
jenkins_job_builder/diskimage.yaml
View File

@ -16,7 +16,7 @@
- project:
name: sahara-image-elements
github-org: openstack
plugin:
plugin:
- vanilla_2.7.1
- cdh_5.5.0
- cdh_5.7.0
@ -31,6 +31,7 @@
plugin:
- spark_1.6.0
- storm_1.0.1
- storm_1.1.0
- mapr_5.1.0.mrv2
- mapr_5.2.0.mrv2
os: u14

1
jenkins_job_builder/sahara.yaml
View File

@ -48,6 +48,7 @@
- mapr_5.2.0.mrv2
- spark_1.6.0
- storm_1.0.1
- storm_1.1.0
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:

5
slave-scripts/dib.sh
View File

@ -109,6 +109,11 @@ case $plugin in
check_error_code $? "${storm_1_0_1_image:?}".qcow2
upload_image "${plugin}" "${username}" "${storm_1_0_1_image:?}"
;;
storm_1.1.0)
env ubuntu_storm_image_name="${storm_1_1_0_image:?}" SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p storm -t 1.1.0
check_error_code $? "${storm_1_1_0_image:?}".qcow2
upload_image "${plugin}" "${username}" "${storm_1_1_0_image:?}"
;;
esac
cd $SAHARA_PATH

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

@ -83,6 +83,9 @@ upload_image() {
storm_1.0.1)
image_properties="--property _sahara_tag_storm=True --property _sahara_tag_1.0.1=True --property _sahara_username=${username}"
;;
storm_1.1.0)
image_properties="--property _sahara_tag_storm=True --property _sahara_tag_1.1.0=True --property _sahara_username=${username}"
;;
esac
register_new_image "$image" "$image_properties"
CUR_IMAGE="$image"