x/sahara-ci-config
Code Issues Proposed changes

Restructure sahara-ci jobs

Browse Source 
Move jobs in master and mitaka from c6.6 to c7 and
remove transient jobs, remove 6.6 jobs from dib

Change-Id: I36b3d24ce5c84eedb393a033c0970adc8788003c
This commit is contained in:
Evgeny Sikachev 2016-07-20 16:43:10 +03:00
parent 9e16aad1c5
commit cab8cef973
5 changed files with 49 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
config/zuul/layout.yaml
View File

@ -72,16 +72,16 @@ projects:
- gate-sahara-vanilla_2.7.1-u14
- gate-sahara-spark_1.3.1-u14-aio
- gate-sahara-spark_1.6.0-u14-aio
- gate-sahara-transient-u14
- gate-sahara-mapr_5.1.0.mrv2-u14
- 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
- gate-sahara-cdh_5.5.0-c6.6-aio
- gate-sahara-cdh_5.5.0-c7-aio
- gate-sahara-cdh_5.7.0-c7-aio
- gate-sahara-ambari_2.3-c6.6
- gate-sahara-ambari_2.4-c6.6
- gate-sahara-cdh_5.7.0-u14-aio
- gate-sahara-storm_1.0.1-u14-aio
- gate-sahara-ambari_2.3-c7
- gate-sahara-ambari_2.4-c7
- gate-sahara-ambari_2.4-u14
- gate-sahara-pep8-trunk
- tempest-sahara-tests
@ -90,35 +90,28 @@ projects:
- gate-sahara_tests-vanilla_2.7.1-u14
- 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.1.0.mrv2-u14
- 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
- gate-sahara_tests-ambari_2.4-c6.6
- gate-sahara_tests-cdh_5.5.0-c7-aio
- gate-sahara_tests-ambari_2.3-c7
- gate-sahara_tests-ambari_2.4-c7
- gate-sahara_tests-cdh_5.5.0-u14-mitaka
- gate-sahara_tests-cdh_5.5.0-c6.6-mitaka
- gate-sahara_tests-cdh_5.5.0-c7-mitaka
- gate-sahara_tests-spark_1.3.1-u14-mitaka
- gate-sahara_tests-spark_1.6.0-u14-mitaka
- gate-sahara_tests-vanilla_2.7.1-u14-mitaka
- gate-sahara_tests-ambari_2.3-c6.6-mitaka
- gate-sahara_tests-storm_1.0.1-u14-aio
- gate-sahara_tests-ambari_2.3-c7-mitaka
nightly:
- nightly-sahara_tests-vanilla_2.7.1-u14
- 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-cdh_5.5.0-u14-aio
- nightly-sahara_tests-cdh_5.5.0-c6.6-aio
- nightly-sahara_tests-ambari_2.3-c6.6
- nightly-sahara_tests-ambari_2.4-c6.6
- nightly-sahara_tests-cdh_5.5.0-c7-aio
- nightly-sahara_tests-ambari_2.3-c7
- nightly-sahara_tests-ambari_2.4-c7
- nightly-sahara_tests-cdh_5.5.0-u14-mitaka
- nightly-sahara_tests-cdh_5.5.0-c6.6-mitaka
- nightly-sahara_tests-spark_1.6.0-u14-mitaka
- nightly-sahara_tests-vanilla_2.7.1-u14-mitaka
- nightly-sahara_tests-ambari_2.3-c6.6-mitaka
- nightly-sahara_tests-storm_1.0.1-u14-aio
weekly:
- weekly-sahara_tests-cdh_5.4.0-u12-liberty
@ -135,35 +128,27 @@ projects:
- name: openstack/sahara-image-elements
check:
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
- dib-vanilla_2.7.1-c7
- dib-mapr_5.1.0.mrv2-u14
- dib-spark_1.3.1-u14-aio
- dib-spark_1.6.0-u14-aio
- dib-ambari_2.1-c6.6
- 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
- dib-cdh_5.5.0-c7-aio
- dib-cdh_5.7.0-c7-aio
- dib-storm_1.0.1-u14-aio
- dib-ambari_2.2-c7
- dib-ambari_2.2-u14
post:
- dib-vanilla_2.7.1-u14
- dib-vanilla_2.7.1-c6.6
- dib-vanilla_2.7.1-c7
- dib-mapr_5.1.0.mrv2-u14
- dib-spark_1.3.1-u14-aio
- dib-spark_1.6.0-u14-aio
- dib-ambari_2.1-c6.6
- 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
- dib-cdh_5.5.0-c7-aio
- dib-cdh_5.7.0-c7-aio
- dib-storm_1.0.1-u14-aio
- dib-ambari_2.2-c7
- dib-ambari_2.2-u14
- name: openstack/sahara-ci-config
check:
- sahara-ci-syntax-check
@ -205,7 +190,7 @@ jobs:
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly|weekly).*-spark_1.3.1-.*$
branch: ^(master|stable/liberty|stable/mitaka)$
branch: stable/liberty
files:
- ^sahara_tests/scenario/defaults/spark-1.3.1.*$
- ^sahara_tests/scenario/defaults/liberty/spark-1.3.1.*$
@ -224,7 +209,7 @@ jobs:
- ^diskimage-create/.*$
- ^elements/.*$
- name: ^(?!nightly).*-cdh_5.5.0-.*$
branch: ^(master|stable/mitaka)$
branch: stable/mitaka
files:
- ^sahara_tests/scenario/defaults/cdh-5.5.*$
- ^sahara_tests/scenario/defaults/mitaka/cdh-5.5.*$
@ -242,10 +227,8 @@ jobs:
- ^sahara_tests/.*.py$
- ^diskimage-create/.*$
- ^elements/.*$
- name: dib-vanilla_2.7.1-c6.6
voting: false
- name: ^(?!nightly).*-ambari_2.3-.*$
branch: ^(master|stable/mitaka)$
branch: stable/mitaka
voting: false
files:
- ^sahara_tests/scenario/defaults/ambari-2.3.*$

6
jenkins_job_builder/diskimage.yaml
View File

@ -34,7 +34,6 @@
plugin: vanilla_2.7.1
os:
- u14
- c6.6
- c7
jobs:
@ -44,7 +43,6 @@
- cdh_5.4.0
os:
- u12
- c6.6
- 'dib-{plugin}-{os}-aio':
plugin:
- cdh_5.5.0
@ -61,6 +59,4 @@
os: u14
- 'dib-{plugin}-{os}':
plugin:
- ambari_2.1
os:
- c6.6
- ambari_2.2

34
jenkins_job_builder/sahara.yaml
View File

@ -93,7 +93,6 @@
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- vanilla_2.7.1
- transient
- mapr_5.1.0.mrv2
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
@ -101,7 +100,7 @@
- cdh_5.5.0
os:
- u14
- c6.6
- c7
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
plugin:
- cdh_5.7.0
@ -117,7 +116,14 @@
plugin:
- ambari_2.3
- ambari_2.4
os: c6.6
os:
- c7
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- ambari_2.4
os:
- u14
- c7
- 'tempest-{name}-tests'
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
@ -131,7 +137,7 @@
- cdh_5.5.0
os:
- u14
- c6.6
- c7
release: mitaka
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
@ -141,7 +147,7 @@
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- ambari_2.3
os: c6.6
os: c7
release: mitaka
- project:
@ -150,17 +156,10 @@
- nightly
project_name:
- sahara_tests
plugin:
- cdh_5.4.0
os:
- u12
- c6.6
jobs:
- '{pipeline}-{project_name}-{plugin}-{os}-aio'
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- vanilla_2.7.1
- transient
- mapr_5.1.0.mrv2
os: u14
- '{pipeline}-{project_name}-{plugin}-{os}-aio':
@ -174,15 +173,18 @@
- cdh_5.5.0
os:
- u14
- c6.6
- c7
- '{pipeline}-{project_name}-{plugin}-{os}':
plugin:
- ambari_2.3
- ambari_2.4
os: c6.6
os: c7
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- cdh_5.4.0
os:
- u12
- c6.6
release: liberty
pipeline: weekly
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
@ -197,7 +199,7 @@
- cdh_5.5.0
os:
- u14
- c6.6
- c7
release: mitaka
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
@ -207,7 +209,7 @@
- '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
plugin:
- ambari_2.3
os: c6.6
os: c7
release: mitaka
- project:

10
slave-scripts/dib.sh
View File

@ -100,13 +100,13 @@ case $plugin in
template_image_prefix="cdh_5_7_0"
;;
ambari_2.1)
env ambari_${os_type}_image_name=${ambari_2_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type -v 2.1.0
check_error_code $? ${ambari_2_1_image}.qcow2
upload_image "${plugin}" "${username}" ${ambari_2_1_image}
ambari_2.2)
env ambari_${os_type}_image_name=${ambari_2_2_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type
check_error_code $? ${ambari_2_2_image}.qcow2
upload_image "${plugin}" "${username}" ${ambari_2_2_image}
# we use Ambari 2.1 management console for creating HDP 2.3 stack
scenario_conf_file="$sahara_templates_path/ambari-2.3.yaml.mako"
template_image_prefix="ambari_2_1"
template_image_prefix="ambari_2_2"
;;
mapr_5.1.0.mrv2)

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

@ -38,14 +38,14 @@ case $plugin in
ambari_2.3)
mode=distribute
scenario_conf_file="$sahara_templates_path/ambari-2.3.yaml.mako"
template_image_prefix="ambari_2_1"
image_name="ambari_2.1_c6.6"
template_image_prefix="ambari_2_2"
image_name="ambari_2.2_c7"
;;
ambari_2.4)
mode=distribute
scenario_conf_file="$sahara_templates_path/ambari-2.4.yaml.mako"
template_image_prefix="ambari_2_4"
image_name="ambari_2.4_c6.6"
template_image_prefix="ambari_2_2"
image_name="ambari_2.2_c7"
;;
vanilla_2.7.1)
mode=distribute