x/sahara-ci-config
Code Issues Proposed changes

remove stable/kilo branch tests

Browse Source 
stable/kilo is EOL-ed, so we can drop testing this branch
for sahara-ci

Change-Id: Ib486157e51cedd882e6dc39fbc573c83c451a4fd
This commit is contained in:
Vitaly Gridnev 2016-05-18 12:57:01 +03:00
parent 78cb5fa1c1
commit 78d51fb65c
5 changed files with 5 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
config/zuul/layout.yaml
View File

@ -51,16 +51,12 @@ pipelines:
projects:
- name: openstack/sahara
check:
- gate-sahara-vanilla_2.6.0-u14
- gate-sahara-vanilla_2.7.1-u14
- gate-sahara-spark_1.0.0-u14-aio
- gate-sahara-spark_1.3.1-u14-aio
- gate-sahara-spark_1.6.0-u14-aio
- gate-sahara-transient-u14
- gate-sahara-mapr_5.0.0.mrv2-u14
- gate-sahara-mapr_5.1.0.mrv2-u14
- gate-sahara-cdh_5.3.0-u12-aio
- gate-sahara-cdh_5.3.0-c6.6-aio
- gate-sahara-cdh_5.4.0-u12-aio
- gate-sahara-cdh_5.4.0-c6.6-aio
- gate-sahara-cdh_5.5.0-u14-aio
@ -72,16 +68,12 @@ projects:
- name: openstack/sahara-tests
check:
- gate-sahara_tests-vanilla_2.6.0-u14
- gate-sahara_tests-vanilla_2.7.1-u14
- gate-sahara_tests-spark_1.0.0-u14-aio
- gate-sahara_tests-spark_1.3.1-u14-aio
- gate-sahara_tests-spark_1.6.0-u14-aio
- gate-sahara_tests-transient-u14
- gate-sahara_tests-mapr_5.0.0.mrv2-u14
- gate-sahara_tests-mapr_5.1.0.mrv2-u14
- gate-sahara_tests-cdh_5.3.0-u12-aio
- gate-sahara_tests-cdh_5.3.0-c6.6-aio
- gate-sahara_tests-cdh_5.5.0-u14-aio
- gate-sahara_tests-cdh_5.5.0-c6.6-aio
- gate-sahara_tests-ambari_2.3-c6.6
@ -100,15 +92,11 @@ projects:
- gate-sahara_tests-ambari_2.4-c6.6-mitaka
periodic:
- nightly-sahara_tests-vanilla_2.6.0-u14
- nightly-sahara_tests-vanilla_2.7.1-u14
- nightly-sahara_tests-spark_1.0.0-u14-aio
- nightly-sahara_tests-spark_1.3.1-u14-aio
- nightly-sahara_tests-spark_1.6.0-u14-aio
- nightly-sahara_tests-transient-u14
- nightly-sahara_tests-mapr_5.0.0.mrv2-u14
- nightly-sahara_tests-cdh_5.3.0-u12-aio
- nightly-sahara_tests-cdh_5.3.0-c6.6-aio
- nightly-sahara_tests-cdh_5.4.0-u12-aio
- nightly-sahara_tests-cdh_5.4.0-c6.6-aio
- nightly-sahara_tests-cdh_5.5.0-u14-aio
@ -136,37 +124,27 @@ projects:
- name: openstack/sahara-image-elements
check:
- dib-vanilla_2.6.0-u14
- dib-vanilla_2.6.0-c6.6
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
- dib-vanilla_2.7.1-c7
- dib-mapr_5.0.0.mrv2-u14
- dib-mapr_5.1.0.mrv2-u14
- dib-spark_1.0.0-u14-aio
- dib-spark_1.3.1-u14-aio
- dib-spark_1.6.0-u14-aio
- dib-ambari_2.1-c6.6
- dib-cdh_5.3.0-u12-aio
- dib-cdh_5.3.0-c6.6-aio
- dib-cdh_5.4.0-u12-aio
- dib-cdh_5.4.0-c6.6-aio
- dib-cdh_5.5.0-u14-aio
- dib-cdh_5.5.0-c6.6-aio
post:
- dib-vanilla_2.6.0-u14
- dib-vanilla_2.6.0-c6.6
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
- dib-vanilla_2.7.1-c7
- dib-mapr_5.0.0.mrv2-u14
- dib-mapr_5.1.0.mrv2-u14
- dib-spark_1.0.0-u14-aio
- dib-spark_1.3.1-u14-aio
- dib-spark_1.6.0-u14-aio
- dib-ambari_2.1-c6.6
- dib-cdh_5.3.0-u12-aio
- dib-cdh_5.3.0-c6.6-aio
- dib-cdh_5.4.0-u12-aio
- dib-cdh_5.4.0-c6.6-aio
- dib-cdh_5.5.0-u14-aio
@ -215,14 +193,6 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-cdh_5.3.0-.*$
branch: stable/kilo
files:
- ^sahara_tests/scenario/defaults/kilo/cdh-5.3.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-cdh_5.4.0-.*$
branch: stable/liberty
files:
@ -241,14 +211,6 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-spark_1.0.0-.*$
branch: stable/kilo
files:
- ^sahara_tests/scenario/defaults/kilo/spark-1.0.0.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-spark_1.6.0-.*$
branch: ^(master|stable/mitaka)$
files:
@ -302,16 +264,8 @@ jobs:
- name: dib-vanilla_2.7.1-c7
branch: ^(master|stable/mitaka)$
voting: false
- name: ^(?!nightly).*-vanilla_2.6.0-.*$
branch: stable/kilo
files:
- ^sahara_tests/scenario/defaults/kilo/vanilla-2.6.0.*$
- ^sahara/.*$
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: gate-sahara-pep8-trunk
branch: ^(master|stable/kilo|stable/liberty|stable/mitaka)$
branch: ^(master|stable/liberty|stable/mitaka)$
voting: false
- name: ^(?!nightly).*-ambari_2.1-.*$
branch: ^(master|stable/mitaka)$
@ -323,4 +277,4 @@ jobs:
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-sahara_tests-.*$
branch: ^(master|stable/liberty|stable/kilo|stable/mitaka)$
branch: ^(master|stable/liberty|stable/mitaka)$

4
jenkins_job_builder/sahara.yaml
View File

@ -107,7 +107,6 @@
- c6.6
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- spark_1.0.0
- spark_1.3.1
- spark_1.6.0
os: u14
@ -155,7 +154,6 @@
project_name:
- sahara_tests
plugin:
- cdh_5.3.0
- cdh_5.4.0
os:
- u12
@ -164,7 +162,6 @@
- '{pipeline}-{project_name}-{plugin}-{os}-aio'
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- vanilla_2.6.0
- vanilla_2.7.1
- transient
- mapr_5.0.0.mrv2
@ -172,7 +169,6 @@
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- spark_1.0.0
- spark_1.3.1
- spark_1.6.0
os: u14

26
slave-scripts/dib.sh
View File

@ -51,14 +51,6 @@ case "${os}" in
esac
case $plugin in
vanilla_2.6.0)
env ${os_type}_vanilla_hadoop_2_6_image_name=${vanilla_2_6_0_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p vanilla -i $os_type -v 2.6
check_error_code $? ${vanilla_2_6_0_image}.qcow2
upload_image "${plugin}" "${username}" ${vanilla_2_6_0_image}
mode=distribute
scenario_conf_file="$sahara_templates_path/vanilla-2.6.0.yaml.mako"
template_image_prefix="vanilla_two_six"
;;
vanilla_2.7.1)
env ${os_type}_vanilla_hadoop_2_7_1_image_name=${vanilla_2_7_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p vanilla -i $os_type -v 2.7.1
check_error_code $? ${vanilla_2_7_1_image}.qcow2
@ -68,14 +60,6 @@ case $plugin in
template_image_prefix="vanilla_two_seven_one"
;;
spark_1.0.0)
env ubuntu_spark_image_name=${spark_1_0_0_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p spark -s 1.0.2
check_error_code $? ${spark_1_0_0_image}.qcow2
upload_image "${plugin}" "${username}" ${spark_1_0_0_image}
scenario_conf_file="$sahara_templates_path/spark-1.0.0.yaml.mako"
template_image_prefix="spark"
;;
spark_1.3.1)
env ubuntu_spark_image_name=${spark_1_3_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p spark -s 1.3.1
check_error_code $? ${spark_1_3_1_image}.qcow2
@ -92,14 +76,6 @@ case $plugin in
template_image_prefix="spark_1_6"
;;
cdh_5.3.0)
env cloudera_5_3_${os_type}_image_name=${cdh_5_3_0_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p cloudera -i $os_type -v 5.3
check_error_code $? ${cdh_5_3_0_image}.qcow2
upload_image "${plugin}" "${username}" ${cdh_5_3_0_image}
scenario_conf_file="$sahara_templates_path/cdh-5.3.0.yaml.mako"
template_image_prefix="cdh"
;;
cdh_5.4.0)
env cloudera_5_4_${os_type}_image_name=${cdh_5_4_0_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p cloudera -i $os_type -v 5.4
check_error_code $? ${cdh_5_4_0_image}.qcow2
@ -147,7 +123,7 @@ cd $SAHARA_PATH
sudo pip install . --no-cache-dir
enable_pypi
write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
write_tests_conf "$cluster_name" "$template_image_prefix" "$image_name" "$scenario_conf_file" # support kilo
write_tests_conf "$cluster_name" "$template_image_prefix" "$image_name" "$scenario_conf_file"
start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file"
print_python_env
cleanup_image "$plugin" "$os"

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

@ -29,9 +29,6 @@ case $ZUUL_BRANCH in
stable/liberty)
sahara_templates_path="$sahara_templates_path/liberty"
;;
stable/kilo)
sahara_templates_path="$sahara_templates_path/kilo"
;;
stable/mitaka)
sahara_templates_path="$sahara_templates_path/mitaka"
;;
@ -50,11 +47,6 @@ case $plugin in
template_image_prefix="ambari_2_1"
image_name="ambari_2.1_c6.6"
;;
vanilla_2.6.0)
mode=distribute
scenario_conf_file="$sahara_templates_path/vanilla-2.6.0.yaml.mako"
template_image_prefix="vanilla_two_six"
;;
vanilla_2.7.1)
mode=distribute
scenario_conf_file="$sahara_templates_path/vanilla-2.7.1.yaml.mako"
@ -62,21 +54,13 @@ case $plugin in
;;
transient)
# transient is using image with latest vanilla version
if [ "$ZUUL_BRANCH" == "stable/kilo" ]; then
image_name=vanilla_2.6.0_u14
else
image_name=vanilla_2.7.1_u14
fi
template_image_prefix="vanilla_two_seven_one"
sahara_plugin=vanilla
concurrency=3
mode=distribute
scenario_conf_file="$sahara_templates_path/transient.yaml.mako"
;;
cdh_5.3.0)
scenario_conf_file="$sahara_templates_path/cdh-5.3.0.yaml.mako"
template_image_prefix="cdh"
;;
cdh_5.4.0)
scenario_conf_file="$sahara_templates_path/cdh-5.4.0.yaml.mako"
template_image_prefix="cdh_5_4_0"
@ -85,10 +69,6 @@ case $plugin in
scenario_conf_file="$sahara_templates_path/cdh-5.5.0.yaml.mako"
template_image_prefix="cdh_5_5_0"
;;
spark_1.0.0)
scenario_conf_file="$sahara_templates_path/spark-1.0.0.yaml.mako"
template_image_prefix="spark"
;;
spark_1.3.1)
scenario_conf_file="$sahara_templates_path/spark-1.3.1.yaml.mako"
template_image_prefix="spark_1_3"
@ -118,6 +98,6 @@ esac
sudo pip install -r requirements.txt . --no-cache-dir
enable_pypi
write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
write_tests_conf "$cluster_name" "$template_image_prefix" "$image_name" "$scenario_conf_file" # support kilo
write_tests_conf "$cluster_name" "$template_image_prefix" "$image_name" "$scenario_conf_file"
start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file" "$concurrency"
print_python_env

12
slave-scripts/gate-sahara_tests.sh
View File

@ -12,18 +12,6 @@ case $release in
mitaka)
ZUUL_BRANCH="stable/mitaka"
;;
*)
case $plugin in
vanilla_2.6.0)
ZUUL_BRANCH="stable/kilo"
;;
cdh_5.3.0)
ZUUL_BRANCH="stable/kilo"
;;
spark_1.0.0)
ZUUL_BRANCH="stable/kilo"
;;
esac
esac
sahara_path="/tmp/sahara"