x/sahara-ci-config
Code Issues Proposed changes

Merge "Update image names to latest"

Browse Source
This commit is contained in:
Jenkins
2015-01-16 12:42:08 +00:00
committed by Gerrit Code Review
parent 38a228d844 01c57d5d2d
commit c891c93a51
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/devstack/local.sh
View File

@@ -20,11 +20,11 @@ else
USE_NEUTRON=false
fi
VANILLA24_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-2.4.1-ubuntu-13.10.qcow2
VANILLA24_IMAGE_PATH=/home/ubuntu/images/sahara-vanilla-2.4.1-ubuntu-14.04.qcow2
VANILLA26_IMAGE_PATH=/home/ubuntu/images/sahara-vanilla-2.6.0-ubuntu-14.04.qcow2
VANILLA_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-1.2.1-ubuntu-13.10.qcow2
HDP1_IMAGE_PATH=/home/ubuntu/images/centos-6_4-64-hdp-1.3-sk
HDP2_IMAGE_PATH=/home/ubuntu/images/centos-6_4-64-hdp-2-0.qcow2
VANILLA_IMAGE_PATH=/home/ubuntu/images/sahara-vanilla-1.2.1-ubuntu-14.04.qcow2
HDP1_IMAGE_PATH=/home/ubuntu/images/centos_6-6_hdp-1.qcow2
HDP2_IMAGE_PATH=/home/ubuntu/images/centos_6-6_hdp-2.qcow2
CENTOS_CDH_IMAGE_PATH=/home/ubuntu/images/centos_sahara_cloudera_latest.qcow2
UBUNTU_CDH_IMAGE_PATH=/home/ubuntu/images/ubuntu_sahara_cloudera_latest.qcow2
SPARK_IMAGE_PATH=/home/ubuntu/images/sahara_spark_latest.qcow2
@@ -67,11 +67,11 @@ nova flavor-delete m1.small
nova flavor-create --is-public true m1.small 2 1024 20 1
# add images for tests
glance image-create --name ubuntu-vanilla-2.4-latest --file $VANILLA24_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.4.1'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
glance image-create --name ubuntu-vanilla-2.6-latest --file $VANILLA26_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.6.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
glance image-create --name sahara-itests-ci-vanilla-image --file $VANILLA_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.2.1'='True' --property '_sahara_tag_1.1.2'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
glance image-create --name sahara-itests-ci-hdp-image-jdk-iptables-off --file $HDP1_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.3.2'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'='root'
glance image-create --name centos-6_4-64-hdp-2-0-hw --file $HDP2_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.0.6'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'='root'
glance image-create --name ubuntu_vanilla_1_latest --file $VANILLA_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.2.1'='True' --property '_sahara_tag_1.1.2'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
glance image-create --name ubuntu_vanilla_2.4_latest --file $VANILLA24_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.4.1'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
glance image-create --name ubuntu_vanilla_2.6_latest --file $VANILLA26_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.6.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'='ubuntu'
glance image-create --name sahara_hdp_1_latest --file $HDP1_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_1.3.2'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'='root'
glance image-create --name sahara_hdp_2_latest --file $HDP2_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.0.6'='True' --property '_sahara_tag_hdp'='True' --property '_sahara_username'='root'
glance image-create --name centos_cdh_latest --file $CENTOS_CDH_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_5'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="cloud-user"
glance image-create --name ubuntu_cdh_latest --file $UBUNTU_CDH_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_5'='True' --property '_sahara_tag_cdh'='True' --property '_sahara_username'="ubuntu"
glance image-create --name sahara_spark_latest --file $SPARK_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_spark'='True' --property '_sahara_tag_1.0.0'='True' --property '_sahara_username'="ubuntu"
@@ -96,7 +96,7 @@ fi
nova --os-username ci-user --os-password nova --os-tenant-name ci keypair-add public-jenkins > /dev/null
# enable auto assigning of floating ips
#enable auto assigning of floating ips
#ps -ef | grep -i "nova-network" | grep -v grep | awk '{print $2}' | xargs sudo kill -9
#sudo sed -i -e "s/default_floating_pool = public/&\nauto_assign_floating_ip = True/g" /etc/nova/nova.conf
#screen -dmS nova-network /bin/bash -c "/usr/local/bin/nova-network --config-file /etc/nova/nova.conf || touch /opt/stack/status/stack/n-net.failure"

19
slave-scripts/dib.sh
View File

@@ -262,7 +262,7 @@ then
exit 1
fi
if [ "$ZUUL_PIPELINE" == "check" ]
if [ "$ZUUL_PIPELINE" == "check" -o "$ZUUL_BRANCH" != "master" ]
then
if [[ "${plugin}" =~ vanilla ]]; then
if [ "${hadoop_version}" == "1" ]; then
@@ -285,21 +285,22 @@ then
fi
else
if [[ "${plugin}" =~ vanilla ]]; then
hadoop_version=$(echo $plugin | awk -F '_' '{print $2}')
if [ "${hadoop_version}" == "1" ]; then
delete_image ${image_type}_sahara_vanilla_hadoop_1_latest
rename_image $VANILLA_IMAGE ${image_type}_sahara_vanilla_hadoop_1_latest
delete_image ${image_type}_vanilla_1_latest
rename_image $VANILLA_IMAGE ${image_type}_vanilla_1_latest
else
delete_image ${image_type}_sahara_vanilla_hadoop_${hadoop_version}_latest
rename_image $VANILLA_TWO_IMAGE ${image_type}_sahara_vanilla_hadoop_${hadoop_version}_latest
delete_image ${image_type}_vanilla_${hadoop_version}_latest
rename_image $VANILLA_TWO_IMAGE ${image_type}_vanilla_${hadoop_version}_latest
fi
fi
if [ "${plugin}" == "hdp1" ]; then
delete_image centos_sahara_hdp_hadoop_1_latest
rename_image $HDP_IMAGE centos_sahara_hdp_hadoop_1_latest
delete_image sahara_hdp_1_latest
rename_image $HDP_IMAGE sahara_hdp_1_latest
fi
if [ "${plugin}" == "hdp2" ]; then
delete_image centos_sahara_hdp_hadoop_2_latest
rename_image $HDP_TWO_IMAGE centos_sahara_hdp_hadoop_2_latest
delete_image sahara_hdp_2_latest
rename_image $HDP_TWO_IMAGE sahara_hdp_2_latest
fi
if [ "${plugin}" == "cdh" ]; then
delete_image ${image_type}_cdh_latest

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

@@ -20,10 +20,10 @@ SKIP_SCALING_TEST=False
SKIP_TRANSIENT_TEST=True
SKIP_ONLY_TRANSIENT_TEST=False
SKIP_ALL_TESTS_FOR_PLUGIN=False
HDP_IMAGE=sahara-itests-ci-hdp-image-jdk-iptables-off
HDP_TWO_IMAGE=centos-6_4-64-hdp-2-0-hw
VANILLA_IMAGE=sahara-itests-ci-vanilla-image
VANILLA_TWO_IMAGE=ubuntu-vanilla-2.4-latest
HDP_IMAGE=sahara_hdp_1_latest
HDP_TWO_IMAGE=sahara_hdp_2_latest
VANILLA_IMAGE=ubuntu_vanilla_1_latest
VANILLA_TWO_IMAGE=ubuntu_vanilla_2.4_latest
SPARK_IMAGE=sahara_spark_latest
HEAT_JOB=False
@@ -55,7 +55,7 @@ case $JOB_TYPE in
[ "$ZUUL_BRANCH" == "stable/icehouse" ] && echo "Vanilla 2.4 plugin is not supported in stable/icehouse" && exit 0
else
hadoop_version=2-6
VANILLA_TWO_IMAGE=ubuntu-vanilla-2.6-latest
VANILLA_TWO_IMAGE=ubuntu_vanilla_2.6_latest
[ "$ZUUL_BRANCH" == "stable/icehouse" -o "$ZUUL_BRANCH" == "stable/juno" ] && echo "Vanilla 2.6 plugin is not supported in stable/icehouse and stable/juno" && exit 0
fi
echo "Vanilla2 detected"