From cb0cbc7b83c0b74e9ec1ea102fe6606c62d5f2af Mon Sep 17 00:00:00 2001 From: Amrith Kumar Date: Wed, 2 Nov 2016 06:34:46 -0400 Subject: [PATCH] rationalize trove CI jobs for stable branches As part of the project to get rid of the trove-integration repository, all things there were moved into the trove repository early in Ocata. Therefore, for stable liberty/mitaka and newton, CI will continue to use trove-integration, and for master (soon to be Ocata), and beyond we don't use trove-integration. In refactoring the CI jobs, I failed to handle the stable branches properly and for two jobs in particular, gate-trove-functional-dsvm- and gate-trove-scenario-functional-dsvm-, I did not ensure that stable branches got the right jobs. This commit aims to fix that. I hope :) Here is the detailed list of changes being made. 1. in jenkins/jobs/projects.yaml, many of the trove-integration jobs were mixed in with the trove jobs in the trove project. Made a trove-integration project and moved the trove-integration specific jobs there. 2. in jenkins/jobs/projects.yaml the trove job gate-trove-legacy-functional-dsvm- is now independent of the trove-integration job by the same name. 3. in zuul/layout.yaml added branch specifiers for the gate-trove-legacy- and gate-trove- non-legacy jobs. 4. in zuul/layout.yaml, add gate-trove-legacy-scenario-functional- jobs to trove. Change-Id: I8bfdc22b814799b2aaaa7ecd077bb2e5a9b989e4 --- jenkins/jobs/projects.yaml | 50 +++++++++++++++++++++++--------------- zuul/layout.yaml | 31 ++++++++++++++++++++--- 2 files changed, 58 insertions(+), 23 deletions(-) diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 2463f03c8b..ed30ec7309 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -14708,19 +14708,8 @@ branch-override: default - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}': datastore: 'mysql' - job-suffix: '-liberty' - branch-override: stable/liberty - - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}': - datastore: 'mysql' - job-suffix: '-mitaka' - branch-override: stable/mitaka - - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}': - datastore: - - mysql - - redis - job-suffix: '-newton' - node: ubuntu-xenial - branch-override: stable/newton + job-suffix: '' + branch-override: default - 'gate-trove-legacy-scenario-functional-dsvm-{datastore}{job-suffix}': job-suffix: '' branch-override: default @@ -14757,12 +14746,6 @@ - mariadb - mongodb - percona - - 'gate-trove-integration-buildimage-{datastore}{job-suffix}': - job-suffix: '-nv' - datastore: - - mysql - - percona - - mongodb - 'gate-trove-buildimage-{datastore}{job-suffix}': job-suffix: '-nv' datastore: @@ -14775,7 +14758,6 @@ - mariadb - cassandra - couchbase - - api-ref-jobs: service: database - gate-{name}-tox-db-{envlist}-{node}: @@ -14801,6 +14783,34 @@ - translation-jobs-newton - openstack-releasenotes-jobs +- project: + name: trove-integration + tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}': + datastore: 'mysql' + job-suffix: '-liberty' + branch-override: stable/liberty + - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}': + datastore: 'mysql' + job-suffix: '-mitaka' + branch-override: stable/mitaka + - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}': + datastore: + - mysql + - redis + job-suffix: '-newton' + node: ubuntu-xenial + branch-override: stable/newton + - 'gate-trove-integration-buildimage-{datastore}{job-suffix}': + job-suffix: '-nv' + datastore: + - mysql + - percona + - mongodb + - project: name: trove-specs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4c560df273..f9bd42389e 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2939,7 +2939,20 @@ jobs: voting: false - name: ^gate-trove-legacy-scenario-functional-dsvm-.*$ - branch: ^(?!stable/(liberty|mitaka)).*$ + branch: ^stable/newton$ + + - name: ^gate-trove-scenario-functional-dsvm-.*$ + branch: ^(?!stable/(liberty|mitaka|newton)).*$ + + # NOTE(amrith): This job should be run for trove-integration, and + # trove's stable branches for liberty, mitaka and newton. + - name: ^gate-trove-legacy-functional-dsvm-.*$ + skip-if: + - project: ^openstack/trove$ + branch: ^(?!stable/(liberty|mitaka|newton)).*$ + + - name: ^gate-trove-functional-dsvm-.*$ + branch: ^(?!stable/(liberty|mitaka|newton)).*$ - name: gate-trove-python34-db branch: ^(?!stable/(liberty|mitaka)).*$ @@ -15399,8 +15412,10 @@ projects: - name: release-notes-jobs check: - gate-trove-functional-dsvm-mysql + - gate-trove-legacy-functional-dsvm-mysql gate: - gate-trove-functional-dsvm-mysql + - gate-trove-legacy-functional-dsvm-mysql - name: openstack/python-vitrageclient template: @@ -17178,21 +17193,31 @@ projects: - name: api-ref-jobs check: - gate-trove-functional-dsvm-mysql + - gate-trove-legacy-functional-dsvm-mysql - gate-tempest-dsvm-trove - gate-trove-scenario-functional-dsvm-mariadb-nv - gate-trove-scenario-functional-dsvm-mysql - gate-trove-scenario-functional-dsvm-postgresql - gate-trove-scenario-functional-dsvm-pxc - gate-trove-scenario-functional-dsvm-redis + - gate-trove-legacy-scenario-functional-dsvm-mysql + - gate-trove-legacy-scenario-functional-dsvm-postgresql + - gate-trove-legacy-scenario-functional-dsvm-pxc + - gate-trove-legacy-scenario-functional-dsvm-redis - gate-trove-tox-db-fakemodetests-ubuntu-xenial - gate-trove-tox-db-apiexamples-ubuntu-xenial - gate-trove-tox-pylint-ubuntu-xenial gate: - gate-trove-functional-dsvm-mysql + - gate-trove-legacy-functional-dsvm-mysql - gate-trove-scenario-functional-dsvm-mysql - gate-trove-scenario-functional-dsvm-redis - gate-trove-scenario-functional-dsvm-postgresql - gate-trove-scenario-functional-dsvm-pxc + - gate-trove-legacy-scenario-functional-dsvm-mysql + - gate-trove-legacy-scenario-functional-dsvm-postgresql + - gate-trove-legacy-scenario-functional-dsvm-pxc + - gate-trove-legacy-scenario-functional-dsvm-redis - gate-trove-tox-db-fakemodetests-ubuntu-xenial - gate-trove-tox-db-apiexamples-ubuntu-xenial - gate-trove-tox-pylint-ubuntu-xenial @@ -17248,7 +17273,7 @@ projects: template: - name: merge-check check: - - gate-trove-functional-dsvm-mysql + - gate-trove-legacy-functional-dsvm-mysql - gate-trove-legacy-functional-dsvm-mysql-liberty - gate-trove-legacy-functional-dsvm-mysql-mitaka - gate-trove-legacy-functional-dsvm-mysql-newton @@ -17258,7 +17283,7 @@ projects: - gate-trove-legacy-scenario-functional-dsvm-postgresql - gate-trove-legacy-scenario-functional-dsvm-pxc gate: - - gate-trove-functional-dsvm-mysql + - gate-trove-legacy-functional-dsvm-mysql - gate-trove-legacy-functional-dsvm-mysql-liberty - gate-trove-legacy-functional-dsvm-mysql-mitaka - gate-trove-legacy-functional-dsvm-mysql-newton