x/sahara-ci-config
Code Issues Proposed changes

Added storm 1.0.1 plugin

Browse Source 
Depends-on: I5f1ba04ea69e6dd467342e7f60305d2aacc2b725

Change-Id: I4bf9f5940754e714810e2d93b1b6ae573a518c9f
This commit is contained in:
Alina Nesterova 2016-07-07 16:58:00 +03:00
parent fc4e002fd2
commit b7315d3343
8 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/devstack/local.sh
View File

@ -36,6 +36,7 @@ SPARK_1_3_1_IMAGE_PATH=/home/ubuntu/images/spark_1.3.1_u14.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
UBUNTU_12_04_IMAGE_PATH=/home/ubuntu/images/ubuntu-12.04-server-cloudimg-amd64-disk1.img
STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
export OS_CLOUD='devstack-admin'
@ -90,6 +91,7 @@ openstack image create $(basename -s .qcow2 $CENTOS7_CDH_5_7_0_IMAGE_PATH) --fil
openstack image create $(basename -s .qcow2 $SPARK_1_3_1_IMAGE_PATH) --file $SPARK_1_3_1_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.3.1'='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 $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 ubuntu-test-image --file $UBUNTU_12_04_IMAGE_PATH --disk-format qcow2 --container-format bare
openstack image create fake_image --file $UBUNTU_12_04_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_fake'='True' --property '_sahara_tag_0.1'='True' --property '_sahara_username'='ubuntu'
openstack image set --name ubuntu-12.04 --property '_sahara_tag_ci'='True' ubuntu-12.04-server-cloudimg-amd64-disk1

2
config/devstack/pre_unstack.sh
View File

@ -27,6 +27,7 @@ CENTOS7_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_c7.qcow2
SPARK_1_3_1_IMAGE_PATH=/home/ubuntu/images/spark_1.3.1_u14.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
STORM_1_0_1_IMAGE_PATH=/home/ubuntu/images/storm_1.0.1_u14.qcow2
openstack image save --file $VANILLA_2_7_1_IMAGE_PATH $(get_id $VANILLA_2_7_1_IMAGE_PATH)
@ -40,6 +41,7 @@ openstack image save --file $CENTOS7_CDH_5_7_0_IMAGE_PATH $(get_id $CENTOS7_CDH_
openstack image save --file $SPARK_1_3_1_IMAGE_PATH $(get_id $SPARK_1_3_1_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 $STORM_1_0_1_IMAGE_PATH $(get_id $STORM_1_0_1_IMAGE_PATH)
bash $TOP_DIR/unstack.sh

14
config/zuul/layout.yaml
View File

@ -63,6 +63,7 @@ projects:
- gate-sahara-cdh_5.7.0-c7-aio
- gate-sahara-ambari_2.3-c6.6
- gate-sahara-ambari_2.4-c6.6
- gate-sahara-storm.1.0.1-u14-aio
- gate-sahara-pep8-trunk
- tempest-sahara-tests
@ -83,6 +84,7 @@ projects:
- gate-sahara_tests-spark_1.6.0-u14-mitaka
- gate-sahara_tests-vanilla_2.7.1-u14-mitaka
- gate-sahara_tests-ambari_2.3-c6.6-mitaka
- gate-sahara_tests-storm.1.0.1-u14-aio
periodic:
- nightly-sahara_tests-vanilla_2.7.1-u14
@ -101,6 +103,7 @@ projects:
- nightly-sahara_tests-spark_1.6.0-u14-mitaka
- nightly-sahara_tests-vanilla_2.7.1-u14-mitaka
- nightly-sahara_tests-ambari_2.3-c6.6-mitaka
- nightly-sahara_tests-storm_1.0.1-u14-aio
- name: openstack/python-saharaclient
check:
@ -123,6 +126,7 @@ projects:
- dib-cdh_5.5.0-c6.6-aio
- dib-cdh_5.5.0-c7-aio
- dib-cdh_5.7.0-c7-aio
- dib-storm_1.0.1-u14-aio
post:
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
@ -137,6 +141,8 @@ projects:
- dib-cdh_5.5.0-c6.6-aio
- dib-cdh_5.5.0-c7-aio
- dib-cdh_5.7.0-c7-aio
- dib-storm_1.0.1-u14-aio
- name: openstack/sahara-ci-config
check:
- sahara-ci-syntax-check
@ -236,6 +242,14 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-storm_1.0.1-.*$
branch: master
files:
- ^sahara_tests/scenario/defaults/storm-1.0.1.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: dib-vanilla_2.7.1-c7
branch: ^(master|stable/mitaka)$
voting: false

3
jenkins_job_builder/diskimage.yaml
View File

@ -53,6 +53,7 @@
plugin:
- spark_1.3.1
- spark_1.6.0
- storm_1.0.1
os: u14
- 'dib-{plugin}-{os}':
plugin:
@ -62,4 +63,4 @@
plugin:
- ambari_2.1
os:
- c6.6
- c6.6

2
jenkins_job_builder/sahara.yaml
View File

@ -111,6 +111,7 @@
plugin:
- spark_1.3.1
- spark_1.6.0
- storm_1.0.1
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
@ -171,6 +172,7 @@
plugin:
- spark_1.3.1
- spark_1.6.0
- storm_1.0.1
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:

7
slave-scripts/dib.sh
View File

@ -117,6 +117,13 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/mapr-5.1.0.mrv2.yaml.mako"
template_image_prefix="mapr_510mrv2"
;;
storm_1.0.1)
env ubuntu_storm_image_name=${storm_1_0_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p storm -t 1.0.1
check_error_code $? ${storm_1_0_1_image}.qcow2
upload_image "${plugin}" "${username}" ${storm_1_0_1_image}
scenario_conf_file="$sahara_templates_path/storm-1.0.1.yaml.mako"
template_image_prefix="storm_1_0_1"
;;
esac
cd $SAHARA_PATH

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

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

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

@ -92,6 +92,10 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/fake.yaml.mako"
template_image_prefix="fake_plugin"
;;
storm_1.0.1)
scenario_conf_file="$sahara_templates_path/storm-1.0.1.yaml.mako"
template_image_prefix="storm_1.0.1"
;;
esac
sudo pip install -r requirements.txt . --no-cache-dir