x/sahara-ci-config
Code Issues Proposed changes

Added Mapr 5.1.0

Browse Source 
Added jobs for Mapr 5.1.0

Change-Id: Ia1d445434611a42e3f90f8bd9a066420d6fdc582
This commit is contained in:
Evgeny Sikachev 2016-03-09 16:13:56 +03:00
parent 25c3db60b0
commit decaeac940
8 changed files with 29 additions and 2 deletions

2
config/devstack/local.sh

@ -39,6 +39,7 @@ CENTOS_CDH_5_4_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.4.0_c6.6.qcow2
SPARK_1_0_0_IMAGE_PATH=/home/ubuntu/images/spark_1.0.0_u14.qcow2
SPARK_1_3_1_IMAGE_PATH=/home/ubuntu/images/spark_1.3.1_u14.qcow2
MAPR_5_0_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.0.0.mrv2_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
export OS_CLOUD='devstack-admin'
@ -96,6 +97,7 @@ openstack image create $(basename -s .qcow2 $CENTOS_CDH_5_4_0_IMAGE_PATH) --file
openstack image create $(basename -s .qcow2 $SPARK_1_0_0_IMAGE_PATH) --file $SPARK_1_0_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.0.0'='True' --property '_sahara_username'="ubuntu"
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 $MAPR_5_0_0_MRV2_IMAGE_PATH) --file $MAPR_5_0_0_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_5.0.0.mrv2'='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 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

@ -27,6 +27,7 @@ CENTOS_CDH_5_4_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.4.0_c6.6.qcow2
SPARK_1_0_0_IMAGE_PATH=/home/ubuntu/images/spark_1.0.0_u14.qcow2
SPARK_1_3_1_IMAGE_PATH=/home/ubuntu/images/spark_1.3.1_u14.qcow2
MAPR_5_0_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.0.0.mrv2_u14.qcow2
MAPR_5_1_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.1.0.mrv2_u14.qcow2
glance image-download --file $VANILLA_2_6_0_IMAGE_PATH $(get_id $VANILLA_2_6_0_IMAGE_PATH)
@ -40,6 +41,7 @@ glance image-download --file $CENTOS_CDH_5_4_0_IMAGE_PATH $(get_id $CENTOS_CDH_5
glance image-download --file $SPARK_1_0_0_IMAGE_PATH $(get_id $SPARK_1_0_0_IMAGE_PATH)
glance image-download --file $SPARK_1_3_1_IMAGE_PATH $(get_id $SPARK_1_3_1_IMAGE_PATH)
glance image-download --file $MAPR_5_0_0_MRV2_IMAGE_PATH $(get_id $MAPR_5_0_0_MRV2_IMAGE_PATH)
glance image-download --file $MAPR_5_1_0_MRV2_IMAGE_PATH $(get_id $MAPR_5_1_0_MRV2_IMAGE_PATH)
bash $TOP_DIR/unstack.sh

6
config/zuul/layout.yaml

@ -40,6 +40,7 @@ projects:
- gate-sahara-neutron-direct-spark_1.6.0-u14-aio
- gate-sahara-neutron-heat-transient-u14
- gate-sahara-neutron-heat-mapr_5.0.0.mrv2-u14
- gate-sahara-neutron-heat-mapr_5.1.0.mrv2-u14
- gate-sahara-nova-direct-cdh_5.3.0-u12-aio
- gate-sahara-nova-direct-cdh_5.3.0-c6.6-aio
- gate-sahara-nova-direct-cdh_5.4.0-u12-aio
@ -60,6 +61,7 @@ projects:
- gate-sahara_tests-neutron-direct-spark_1.6.0-u14-aio
- gate-sahara_tests-neutron-heat-transient-u14
- gate-sahara_tests-neutron-heat-mapr_5.0.0.mrv2-u14
- gate-sahara_tests-neutron-heat-mapr_5.1.0.mrv2-u14
- gate-sahara_tests-nova-direct-cdh_5.3.0-u12-aio
- gate-sahara_tests-nova-direct-cdh_5.3.0-c6.6-aio
- gate-sahara_tests-nova-direct-cdh_5.4.0-u12-aio
@ -87,6 +89,7 @@ projects:
- dib-neutron-heat-vanilla_2.7.1-c6.6
- dib-neutron-heat-vanilla_2.7.1-c7
- dib-neutron-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-heat-mapr_5.1.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-u14-aio
- dib-neutron-direct-spark_1.6.0-u14-aio
@ -105,6 +108,7 @@ projects:
- dib-neutron-heat-vanilla_2.7.1-c6.6
- dib-neutron-heat-vanilla_2.7.1-c7
- dib-neutron-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-heat-mapr_5.1.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-u14-aio
- dib-neutron-direct-spark_1.6.0-u14-aio
@ -141,7 +145,7 @@ jobs:
- all-files-match-any:
- ^doc/.*$
- ^.*\.rst$
- name: ^.*-mapr_5.0.0.mrv2-u14$
- name: ^.*-mapr_5.*$
branch: master
voting: false
- name: ^.*-cdh_5.3.0-.*$

4
jenkins_job_builder/diskimage.yaml

@ -59,7 +59,9 @@
- spark_1.6.0
os: u14
- 'dib-{network}-{engine}-{plugin}-{os}':
plugin: mapr_5.0.0.mrv2
plugin:
- mapr_5.0.0.mrv2
- mapr_5.1.0.mrv2
os: u14
- 'dib-{network}-{engine}-{plugin}-{os}':
network: nova

1
jenkins_job_builder/sahara.yaml

@ -99,6 +99,7 @@
- vanilla_2.7.1
- transient
- mapr_5.0.0.mrv2
- mapr_5.1.0.mrv2
os: u14
network: neutron
- 'gate-{project_name}-{network}-{engine}-{plugin}-{os}-aio':

8
slave-scripts/dib.sh

@ -144,6 +144,14 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"
template_image_prefix="mapr_500mrv2"
;;
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
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"
;;
esac
cd $SAHARA_PATH

3
slave-scripts/functions-dib.sh

@ -87,6 +87,9 @@ upload_image() {
mapr_5.0.0.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.0.0.mrv2=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}"
;;
esac
register_new_image "$image" "$image_properties"
CUR_IMAGE="$image"

5
slave-scripts/gate-sahara.sh

@ -99,6 +99,11 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"
template_image_prefix="mapr_500mrv2"
;;
mapr_5.1.0.mrv2)
mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-5.1.0.mrv2.yaml.mako"
template_image_prefix="mapr_510mrv2"
;;
fake)
mode=distribute
image_name=fake_image