openstack/project-config
Code Issues Proposed changes

set gnocchi 2.2 and 3.0 to correct branches

Browse Source 
- test gnocchi 2.2 against newton as it has dependency on newton tooz.
- test newly tagged gnocchi 3.0 against newton
- test newton against gnocchi 3.0

Change-Id: Iad97ab98fa7d7c8780b1ea096e04440ca0c040dd
This commit is contained in:
gord chung 2016-09-22 12:42:08 +00:00
parent 2d884bfe11
commit f2435adf1e
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/ceilometer.yaml
View File

@ -155,12 +155,14 @@
if [ "$ZUUL_PROJECT" == "openstack/gnocchi" ]; then
case "$ZUUL_BRANCH" in
"stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;;
"stable/2.0"|"stable/2.1"|"stable/2.2") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;;
"stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;;
"stable/2.2"|"stable/3.0") export OVERRIDE_ZUUL_BRANCH=stable/newton ;;
esac
else
case "$ZUUL_BRANCH" in
"stable/liberty") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.3";;
"stable/mitaka") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1";;
"stable/newton") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/3.0";;
esac
fi

3
jenkins/jobs/gnocchi.yaml
View File

@ -24,7 +24,8 @@
case "$ZUUL_BRANCH" in
"stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;;
"stable/2.0"|"stable/2.1"|"stable/2.2") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;;
"stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;;
"stable/2.2"|"stable/3.0") export OVERRIDE_ZUUL_BRANCH=stable/newton ;;
esac
function gate_hook {{

6
zuul/layout.yaml
View File

@ -3187,17 +3187,17 @@ jobs:
branch: ^(?!feature/keystoneauth_integration).*$
- name: ^gate-gnocchi-tox-db-py35
branch: ^(?!stable/(1\..|2\..))
branch: ^(?!stable/(1\..|2\.[01]))
# Use Ubuntu Trusty for stable/1.* and 2.*
# (i.e. everything that is before Newton)
- name: ^gate-gnocchi-dsvm-functional-.+-ubuntu-trusty
branch: ^(stable/(1\..|2\..))
branch: ^(stable/(1\..|2\.[01]))
# Use Ubuntu Xenial for stable/3.* and other future branches
# (i.e. Newton and after)
- name: ^gate-gnocchi-dsvm-functional-.+-ubuntu-xenial
branch: ^(?!stable/(1\..|2\..))
branch: ^(?!stable/(1\..|2\.[01]))
- name: ^gate-sahara-cli.*$
skip-if: