x/sahara-ci-config
Code Issues Proposed changes

Remove Vanilla 2.3 jobs

Browse Source 
Change-Id: I8dea288435966c245859ebb1745462ba9bb5cde5
This commit is contained in:
Denis Egorenko 2014-12-23 15:15:05 +04:00
parent 75122e85d2
commit 2a97387496
7 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/devstack/local.sh
View File

@ -16,7 +16,6 @@ else
USE_NEUTRON=false
fi
VANILLA23_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-2.3.0-ubuntu-13.10.qcow2
VANILLA24_IMAGE_PATH=/home/ubuntu/images/sahara-icehouse-vanilla-2.4.1-ubuntu-13.10.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
@ -64,7 +63,6 @@ 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.3-latest --file $VANILLA23_IMAGE_PATH --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.3.0'='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-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'

8
config/zuul/layout.yaml
View File

@ -32,7 +32,6 @@ projects:
- name: openstack/sahara
check:
- gate-sahara-neutron-direct-vanilla_1-aio
- gate-sahara-neutron-direct-vanilla_2.3-aio
- gate-sahara-neutron-heat-vanilla_2.4
- gate-sahara-neutron-heat-vanilla_2.6
- gate-sahara-neutron-direct-spark-aio
@ -47,7 +46,6 @@ projects:
- name: openstack/python-saharaclient
check:
- gate-saharaclient-neutron-direct-vanilla_1-aio
- gate-saharaclient-neutron-direct-vanilla_2.3-aio
- gate-saharaclient-neutron-heat-vanilla_2.4
- gate-saharaclient-neutron-heat-vanilla_2.6
- gate-saharaclient-neutron-direct-spark-aio
@ -72,9 +70,6 @@ projects:
- dib-neutron-direct-vanilla_1-ubuntu-aio
- dib-neutron-direct-vanilla_1-fedora-aio
- dib-neutron-direct-vanilla_1-centos-aio
- dib-neutron-direct-vanilla_2.3-ubuntu-aio
- dib-neutron-direct-vanilla_2.3-fedora-aio
- dib-neutron-direct-vanilla_2.3-centos-aio
- dib-neutron-heat-vanilla_2.4-ubuntu
- dib-neutron-heat-vanilla_2.4-fedora
- dib-neutron-heat-vanilla_2.4-centos
@ -90,9 +85,6 @@ projects:
- dib-neutron-direct-vanilla_1-ubuntu-aio
- dib-neutron-direct-vanilla_1-fedora-aio
- dib-neutron-direct-vanilla_1-centos-aio
- dib-neutron-direct-vanilla_2.3-ubuntu-aio
- dib-neutron-direct-vanilla_2.3-fedora-aio
- dib-neutron-direct-vanilla_2.3-centos-aio
- dib-neutron-heat-vanilla_2.4-ubuntu
- dib-neutron-heat-vanilla_2.4-fedora
- dib-neutron-heat-vanilla_2.4-centos

1
jenkins_job_builder/diskimage.yaml
View File

@ -95,7 +95,6 @@
github-org: openstack
plugin:
- vanilla_1
- vanilla_2.3
os:
- ubuntu
- fedora

1
jenkins_job_builder/sahara.yaml
View File

@ -133,7 +133,6 @@
github-org: openstack
plugin-neutron:
- direct-vanilla_1-aio
- direct-vanilla_2.3-aio
- heat-vanilla_2.4
- heat-vanilla_2.6
- direct-spark-aio

14
slave-scripts/dib.sh
View File

@ -17,9 +17,6 @@ register_vanilla_image() {
1)
glance image-create --name $3 --file $3.qcow2 --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'="${2}"
;;
2.3)
glance image-create --name $3 --file $3.qcow2 --disk-format qcow2 --container-format bare --is-public=true --property '_sahara_tag_ci'='True' --property '_sahara_tag_2.3.0'='True' --property '_sahara_tag_vanilla'='True' --property '_sahara_username'="${2}"
;;
2.4)
glance image-create --name $3 --file $3.qcow2 --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'="${2}"
;;
@ -63,9 +60,6 @@ upload_image() {
vanilla-1)
register_vanilla_image "1" "$2" "$3"
;;
vanilla-2.3)
register_vanilla_image "2.3" "$2" "$3"
;;
vanilla-2.4)
register_vanilla_image "2.4" "$2" "$3"
;;
@ -140,14 +134,6 @@ case $plugin in
upload_image "vanilla-1" "${username}" ${VANILLA_IMAGE}
PLUGIN_TYPE=vanilla1
;;
2.3)
[ "$ZUUL_BRANCH" != "stable/icehouse" ] && echo "Vanilla 2.3 plugin is deprecated" && exit 0
sudo DIB_REPO_PATH="/home/jenkins/diskimage-builder" ${image_type}_vanilla_hadoop_2_3_image_name=${VANILLA_TWO_IMAGE} JAVA_DOWNLOAD_URL='http://127.0.0.1:8000/jdk-7u51-linux-x64.tar.gz' SIM_REPO_PATH=$WORKSPACE bash diskimage-create/diskimage-create.sh -p vanilla -i $image_type -v 2.3
check_error_code $? ${VANILLA_TWO_IMAGE}.qcow2
upload_image "vanilla-2.3" "${username}" ${VANILLA_TWO_IMAGE}
hadoop_version=2-3
PLUGIN_TYPE=vanilla2
;;
2.4)
VANILLA_TWO_IMAGE=$HOST-sahara-vanilla-${image_type}-${GERRIT_CHANGE_NUMBER}-hadoop_2.4
[ "$ZUUL_BRANCH" == "stable/icehouse" ] && echo "Vanilla 2.4 plugin is not supported in stable/icehouse" && exit 0

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

@ -50,11 +50,7 @@ case $JOB_TYPE in
echo "Vanilla detected"
else
PLUGIN_TYPE=vanilla2
if [ "$hadoop_version" == "2.3" ]; then
VANILLA_TWO_IMAGE=ubuntu-vanilla-2.3-latest
hadoop_version=2-3
[ "$ZUUL_BRANCH" != "stable/icehouse" ] && echo "Vanilla 2.3 plugin is deprecated" && exit 0
elif [ "$hadoop_version" == "2.4" ]; then
if [ "$hadoop_version" == "2.4" ]; then
hadoop_version=2-4
[ "$ZUUL_BRANCH" == "stable/icehouse" ] && echo "Vanilla 2.4 plugin is not supported in stable/icehouse" && exit 0
else

6
slave-scripts/integration-cleanup.sh
View File

@ -30,8 +30,6 @@ if [ $JOB_TYPE == 'dib' ]; then
HADOOP_VERSION=$(echo $PLUGIN | awk -F '_' '{ print $2}')
if [ "$HADOOP_VERSION" == '1' ]; then
python cleanup.py cleanup $HOST-$os-$HADOOP_VERSION-$PREV_BUILD-vanilla-v1
elif [ "$HADOOP_VERSION" == '2.3' ]; then
python cleanup.py cleanup $HOST-$os-2-3-$PREV_BUILD-vanilla-v2
elif [ "$HADOOP_VERSION" == '2.4' ]; then
python cleanup.py cleanup-heat $HOST-$os-2-4-$PREV_BUILD-vanilla-v2
else
@ -65,9 +63,7 @@ else
JOB_TYPE=vanilla-v1
else
JOB_TYPE=vanilla-v2
if [ "$HADOOP_VERSION" == '2.3' ]; then
HADOOP_VERSION=2-3
elif [ "$HADOOP_VERSION" == '2.4' ]; then
if [ "$HADOOP_VERSION" == '2.4' ]; then
HADOOP_VERSION=2-4
else
HADOOP_VERSION=2-6