x
/
sahara-ci-config
Code Issues Proposed changes

Adding of spark 2.1.0 on sahara-ci 

Spark 2.1.0 was added to jobs, jobs to zuul, in scripts

Change-Id: Ief586729d7c9de82febb0f196f26f54c0009af01
This commit is contained in:
Evgeny Sikachev 2017-04-05 12:55:59 +04:00
parent 38855d9228
commit ee19284667
7 changed files with 29 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

@ -35,6 +35,7 @@ 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
SPARK_2_1_0_IMAGE_PATH=/home/ubuntu/images/spark_2.1.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
@ -94,6 +95,7 @@ openstack image create $(basename -s .qcow2 $UBUNTU_CDH_5_7_0_IMAGE_PATH) --file
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 $SPARK_2_1_0_IMAGE_PATH) --file $SPARK_2_1_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_2.1.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"

3
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
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
SPARK_2_1_0_IMAGE_PATH=/home/ubuntu/images/spark_2.1.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
@ -43,9 +44,9 @@ openstack image save --file $UBUNTU_CDH_5_7_0_IMAGE_PATH $(get_id $UBUNTU_CDH_5_
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 $SPARK_2_1_0_IMAGE_PATH $(get_id $SPARK_2_1_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

13
config/zuul/layout.yaml
View File

@ -72,6 +72,7 @@ projects:
- gate-sahara-vanilla_2.7.1-u14
- gate-sahara-spark_1.6.0-u14
- gate-sahara-spark_1.6.0-u14-python3
- gate-sahara-spark_2.1.0-u14
- gate-sahara-mapr_5.1.0.mrv2-u14
- gate-sahara-mapr_5.2.0.mrv2-u14
- gate-sahara-cdh_5.5.0-u14
@ -90,6 +91,7 @@ projects:
check:
- gate-sahara_tests-vanilla_2.7.1-u14
- gate-sahara_tests-spark_1.6.0-u14
- gate-sahara_tests-spark_2.1.0-u14
- 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
@ -204,6 +206,17 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-spark_2.1.0-.*$
skip-if:
- branch: ^(stable/newton|stable/mitaka)$
files:
- ^sahara_tests/scenario/defaults/spark-2.1.0.*$
- ^sahara_tests/scenario/defaults/edp.yaml.mako$
- ^sahara_tests/scenario/defaults/edp-examples/.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-cdh_5.5.0-.*$
skip-if:
- branch: ^(stable/newton|master)$

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
@ -30,6 +30,7 @@
- 'dib-{plugin}-{os}':
plugin:
- spark_1.6.0
- spark_2.1.0
- storm_1.0.1
- mapr_5.1.0.mrv2
- mapr_5.2.0.mrv2

1
jenkins_job_builder/sahara.yaml
View File

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

6
slave-scripts/dib.sh
View File

@ -66,6 +66,12 @@ case $plugin in
upload_image "${plugin}" "${username}" "${spark_1_6_0_image:?}"
;;
spark_2.1.0)
env ubuntu_spark_image_name="${spark_2_1_0_image:?}" SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p spark -s 2.1.0
check_error_code $? "${spark_2_1_0_image:?}".qcow2
upload_image "${plugin}" "${username}" "${spark_2_1_0_image:?}"
;;
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

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

@ -74,6 +74,9 @@ upload_image() {
spark_1.6.0)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.6.0=True --property _sahara_username=${username}"
;;
spark_2.1.0)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_2.1.0=True --property _sahara_username=${username}"
;;
mapr_5.1.0.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.1.0.mrv2=True --property _sahara_username=${username}"
;;