diff --git a/config/devstack/local.sh b/config/devstack/local.sh index 41832682..69daae10 100755 --- a/config/devstack/local.sh +++ b/config/devstack/local.sh @@ -38,6 +38,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' @@ -94,6 +95,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 diff --git a/config/devstack/pre_unstack.sh b/config/devstack/pre_unstack.sh index c50793c9..bcac2d32 100755 --- a/config/devstack/pre_unstack.sh +++ b/config/devstack/pre_unstack.sh @@ -26,6 +26,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) @@ -38,6 +39,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 diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml index ac7fa42e..ceaf5d6f 100644 --- a/config/zuul/layout.yaml +++ b/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 @@ -59,6 +60,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 @@ -85,6 +87,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 @@ -102,6 +105,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 @@ -137,7 +141,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-.*$ diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml index 6816f0eb..5e6284ab 100644 --- a/jenkins_job_builder/diskimage.yaml +++ b/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 diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml index 6c701bc0..58a93909 100644 --- a/jenkins_job_builder/sahara.yaml +++ b/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': diff --git a/slave-scripts/dib.sh b/slave-scripts/dib.sh index d27e3d71..044d82c0 100755 --- a/slave-scripts/dib.sh +++ b/slave-scripts/dib.sh @@ -135,6 +135,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 diff --git a/slave-scripts/functions-dib.sh b/slave-scripts/functions-dib.sh index 7473f038..c882452a 100755 --- a/slave-scripts/functions-dib.sh +++ b/slave-scripts/functions-dib.sh @@ -84,6 +84,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" diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh index a97527f9..0f0a5cfe 100755 --- a/slave-scripts/gate-sahara.sh +++ b/slave-scripts/gate-sahara.sh @@ -94,6 +94,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