x/sahara-ci-config
Code Issues Proposed changes

Merge "Add mapr 520 on sahara-ci"

Browse Source
This commit is contained in:
Jenkins 2016-09-14 11:27:04 +00:00 committed by Gerrit Code Review
commit a06bc4954f
8 changed files with 40 additions and 3 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 @@ UBUNTU_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_u14.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
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
export OS_CLOUD='devstack-admin'
@ -98,6 +99,7 @@ openstack image create $(basename -s .qcow2 $UBUNTU_CDH_5_7_0_IMAGE_PATH) --file
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 $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 set --name ubuntu-14.04 trusty-server-cloudimg-amd64-disk1

2
config/devstack/pre_unstack.sh
View File

@ -30,6 +30,7 @@ UBUNTU_CDH_5_7_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.7.0_u14.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
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
@ -47,6 +48,7 @@ openstack image save --file $UBUNTU_CDH_5_7_0_IMAGE_PATH $(get_id $UBUNTU_CDH_5_
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 $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)
bash $TOP_DIR/unstack.sh

12
config/zuul/layout.yaml
View File

@ -73,6 +73,7 @@ projects:
- gate-sahara-spark_1.3.1-u14-aio
- gate-sahara-spark_1.6.0-u14-aio
- gate-sahara-mapr_5.1.0.mrv2-u14
- gate-sahara-mapr_5.2.0.mrv2-u14
- gate-sahara-cdh_5.4.0-c6.6-aio
- gate-sahara-cdh_5.5.0-u14-aio
- gate-sahara-cdh_5.5.0-c7-aio
@ -90,6 +91,7 @@ projects:
- gate-sahara_tests-spark_1.3.1-u14-aio
- gate-sahara_tests-spark_1.6.0-u14-aio
- gate-sahara_tests-mapr_5.1.0.mrv2-u14
- gate-sahara_tests-mapr_5.2.0.mrv2-u14
- gate-sahara_tests-cdh_5.5.0-u14-aio
- gate-sahara_tests-cdh_5.5.0-c7-aio
- gate-sahara_tests-ambari_2.3-c7
@ -127,6 +129,7 @@ projects:
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c7
- dib-mapr_5.1.0.mrv2-u14
- dib-mapr_5.2.0.mrv2-u14
- dib-spark_1.6.0-u14-aio
- dib-cdh_5.5.0-u14-aio
- dib-cdh_5.5.0-c7-aio
@ -138,6 +141,7 @@ projects:
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c7
- dib-mapr_5.1.0.mrv2-u14
- dib-mapr_5.2.0.mrv2-u14
- dib-spark_1.6.0-u14-aio
- dib-cdh_5.5.0-u14-aio
- dib-cdh_5.5.0-c7-aio
@ -173,6 +177,14 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-mapr_5.2.*$
branch: master
files:
- ^sahara_tests/scenario/defaults/mapr-5.2.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly|weekly).*-cdh_5.4.0-.*$
branch: stable/liberty
files:

1
jenkins_job_builder/diskimage.yaml
View File

@ -56,6 +56,7 @@
- 'dib-{plugin}-{os}':
plugin:
- mapr_5.1.0.mrv2
- mapr_5.2.0.mrv2
os: u14
- 'dib-{plugin}-{os}':
plugin:

2
jenkins_job_builder/sahara.yaml
View File

@ -68,6 +68,7 @@
plugin:
- vanilla_2.7.1
- mapr_5.1.0.mrv2
- mapr_5.2.0.mrv2
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
@ -117,6 +118,7 @@
plugin:
- vanilla_2.7.1
- mapr_5.1.0.mrv2
- mapr_5.2.0.mrv2
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:

12
slave-scripts/dib.sh
View File

@ -110,13 +110,23 @@ case $plugin in
;;
mapr_5.1.0.mrv2)
env mapr_ubuntu_image_name=${mapr_5_1_0_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu
env mapr_ubuntu_image_name=${mapr_5_1_0_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu -r 5.1.0
check_error_code $? ${mapr_5_1_0_mrv2_image}.qcow2
upload_image "${plugin}" "${username}" ${mapr_5_1_0_mrv2_image}
mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-5.1.0.mrv2.yaml.mako"
template_image_prefix="mapr_510mrv2"
;;
mapr_5.2.0.mrv2)
env mapr_ubuntu_image_name=${mapr_5_2_0_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu -r 5.2.0
check_error_code $? ${mapr_5_2_0_mrv2_image}.qcow2
upload_image "${plugin}" "${username}" ${mapr_5_2_0_mrv2_image}
mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-5.2.0.mrv2.yaml.mako"
template_image_prefix="mapr_520mrv2"
;;
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

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

@ -74,12 +74,15 @@ upload_image() {
spark_1.3.1)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.3.1=True --property _sahara_username=${username}"
;;
spark_1.6.0)
spark_1.6.0)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.6.0=True --property _sahara_username=${username}"
;;
mapr_5.1.0.mrv2)
mapr_5.1.0.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.1.0.mrv2=True --property _sahara_username=${username}"
;;
mapr_5.2.0.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.2.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}"
;;

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

@ -85,6 +85,11 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/mapr-5.1.0.mrv2.yaml.mako"
template_image_prefix="mapr_510mrv2"
;;
mapr_5.2.0.mrv2)
mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-5.2.0.mrv2.yaml.mako"
template_image_prefix="mapr_520mrv2"
;;
storm_1.0.1)
scenario_conf_file="$sahara_templates_path/storm-1.0.1.yaml.mako"
template_image_prefix="storm_1_0"