x/sahara-ci-config
Code Issues Proposed changes

Update mapr jobs to last version

Browse Source 
Update MAPR to 5.0.0 version

Change-Id: Idc3a12125bd41aa3191416fdcacb6fd5f8060eb7
This commit is contained in:
Evgeny Sikachev 2015-10-19 11:17:26 +03:00
parent 6835e421a3
commit 930dfc3393
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/devstack/local.sh
View File

@ -34,7 +34,7 @@ UBUNTU_CDH_5_4_0_IMAGE_PATH=/home/ubuntu/images/cdh_5.4.0_u12.qcow2
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_4_0_2_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_4.0.2.mrv2_u14.qcow2
MAPR_5_0_0_MRV2_IMAGE_PATH=/home/ubuntu/images/mapr_5.0.0.mrv2_u14.qcow2
UBUNTU_12_04_IMAGE_PATH=/home/ubuntu/images/ubuntu-12.04-server-cloudimg-amd64-disk1.img
# setup ci tenant and ci users
@ -84,7 +84,7 @@ glance image-create --name $(basename -s .qcow2 $UBUNTU_CDH_5_4_0_IMAGE_PATH) --
glance image-create --name $(basename -s .qcow2 $CENTOS_CDH_5_4_0_IMAGE_PATH) --file $CENTOS_CDH_5_4_0_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_5.4.0'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="cloud-user"
glance image-create --name $(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"
glance image-create --name $(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"
glance image-create --name $(basename -s .qcow2 $MAPR_4_0_2_MRV2_IMAGE_PATH) --file $MAPR_4_0_2_MRV2_IMAGE_PATH --disk-format qcow2 --container-format bare --property '_sahara_tag_ci'='True' --property '_sahara_tag_mapr'='True' --property '_sahara_tag_4.0.2.mrv2'='True' --property '_sahara_username'="ubuntu"
glance image-create --name $(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_4.0.2.mrv2'='True' --property '_sahara_username'="ubuntu"
glance image-create --name ubuntu-test-image --file $UBUNTU_12_04_IMAGE_PATH --disk-format qcow2 --container-format bare
glance image-create --name 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'
glance image-update --name ubuntu-12.04 --property '_sahara_tag_ci'='True' ubuntu-12.04-server-cloudimg-amd64-disk1

8
config/zuul/layout.yaml
View File

@ -33,7 +33,7 @@ projects:
- gate-sahara-neutron-direct-spark_1.3.1-u14-aio
- gate-sahara-neutron-direct-transient-u14
- gate-sahara-neutron-heat-transient-u14
- gate-sahara-neutron-heat-mapr_4.0.2.mrv2-u14
- gate-sahara-neutron-heat-mapr_5.0.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
@ -56,7 +56,7 @@ projects:
- dib-neutron-heat-vanilla_2.7.1-u14
- dib-neutron-heat-vanilla_2.7.1-c6.6
- dib-neutron-heat-vanilla_2.7.1-c7
- dib-neutron-heat-mapr_4.0.2.mrv2-u14
- dib-neutron-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-u14-aio
- dib-nova-heat-hdp_2.0.6-c6.6
@ -71,7 +71,7 @@ projects:
- dib-neutron-heat-vanilla_2.7.1-u14
- dib-neutron-heat-vanilla_2.7.1-c6.6
- dib-neutron-heat-vanilla_2.7.1-c7
- dib-neutron-heat-mapr_4.0.2.mrv2-u14
- dib-neutron-heat-mapr_5.0.0.mrv2-u14
- dib-neutron-direct-spark_1.0.0-u14-aio
- dib-neutron-direct-spark_1.3.1-u14-aio
- dib-nova-heat-hdp_2.0.6-c6.6
@ -100,7 +100,7 @@ jobs:
- all-files-match-any:
- ^doc/.*$
- ^.*\.rst$
- name: ^.*-mapr_4.0.2.mrv2-u14$
- name: ^.*-mapr_5.0.0.mrv2-u14$
branch: master
voting: false
- name: ^.*-cdh_5.3.0-.*$

2
jenkins_job_builder/diskimage.yaml
View File

@ -57,7 +57,7 @@
- spark_1.3.1
os: u14
- 'dib-{network}-{engine}-{plugin}-{os}':
plugin: mapr_4.0.2.mrv2
plugin: mapr_5.0.0.mrv2
os: u14
- 'dib-{network}-{engine}-{plugin}-{os}':
network: nova

2
jenkins_job_builder/sahara.yaml
View File

@ -79,7 +79,7 @@
- vanilla_2.6.0
- vanilla_2.7.1
- transient
- mapr_4.0.2.mrv2
- mapr_5.0.0.mrv2
os: u14
network: neutron
- 'gate-sahara-{network}-{engine}-{plugin}-{os}':

12
slave-scripts/dib.sh
View File

@ -115,13 +115,13 @@ case $plugin in
template_image_prefix="ambari_2_1"
;;
mapr_4.0.2.mrv2)
env mapr_ubuntu_image_name=${mapr_4_0_2_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu
check_error_code $? ${mapr_4_0_2_mrv2_image}.qcow2
upload_image "${plugin}" "${username}" ${mapr_4_0_2_mrv2_image}
mapr_5.0.0.mrv2)
env mapr_ubuntu_image_name=${mapr_5_0_0_mrv2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p mapr -i ubuntu
check_error_code $? ${mapr_5_0_0_mrv2_image}.qcow2
upload_image "${plugin}" "${username}" ${mapr_5_0_0_mrv2_image}
mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-4.0.2.mrv2.yaml.mako"
template_image_prefix="mapr_402mrv2"
scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"
template_image_prefix="mapr_500mrv2"
;;
esac

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

@ -78,8 +78,8 @@ upload_image() {
spark_1.3.1)
image_properties="--property _sahara_tag_spark=True --property _sahara_tag_1.3.1=True --property _sahara_username=${username}"
;;
mapr_4.0.2.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_4.0.2.mrv2=True --property _sahara_username=${username}"
mapr_5.0.0.mrv2)
image_properties="--property _sahara_tag_mapr=True --property _sahara_tag_5.0.0.mrv2=True --property _sahara_username=${username}"
;;
esac
register_new_image "$image" "$image_properties"

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

@ -71,10 +71,10 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/spark-1.3.1.yaml.mako"
template_image_prefix="spark_1_3"
;;
mapr_4.0.2.mrv2)
mapr_5.0.0.mrv2)
mode=distribute
scenario_conf_file="$sahara_templates_path/mapr-4.0.2.mrv2.yaml.mako"
template_image_prefix="mapr_402mrv2"
scenario_conf_file="$sahara_templates_path/mapr-5.0.0.mrv2.yaml.mako"
template_image_prefix="mapr_500mrv2"
;;
fake)
mode=distribute