From bd44635d2d8d3d8eb1ecf19df7b2183020ea4a13 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 7 Dec 2016 11:19:12 -0800 Subject: [PATCH] Transition Magnum jobs to Xenial As part of the Trusty to Xenial transition, move Magnum jobs to Xenial for changes against branches >= newton. Old branches continue to be tested on Trusty. This also updates two periodic jobs to run on Xenial instaed of Trusty. Also cleans up zuul job entries using last match wins fall through behavior. Change-Id: I37385dee3d49c2af6c6d3054df126f1894cd94c2 --- jenkins/jobs/magnum.yaml | 4 +- jenkins/jobs/projects.yaml | 66 +++++++++++--------------------- zuul/layout.yaml | 78 +++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 84 deletions(-) diff --git a/jenkins/jobs/magnum.yaml b/jenkins/jobs/magnum.yaml index 5bae4f0fde..526869d627 100644 --- a/jenkins/jobs/magnum.yaml +++ b/jenkins/jobs/magnum.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}' + name: '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{job-suffix}' node: '{node}' wrappers: @@ -64,7 +64,7 @@ - console-log - job-template: - name: '{pipeline}-magnum-dib-buildimage-{image-name}' + name: '{pipeline}-magnum-dib-buildimage-{image-name}-{node}' node: '{node}' wrappers: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 8f3ec8dae3..cc311ba999 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6684,64 +6684,44 @@ - translation-jobs - install-guide-jobs: service: container-infrastructure-management - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': + - '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty - coe: 'api' + node: + - ubuntu-trusty + - ubuntu-xenial + coe: + - 'api' + - 'k8s' + - 'swarm' + - 'mesos' special: '' job-suffix: '' branch-override: default - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': + - '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty - coe: 'k8s' - special: '' - job-suffix: '' - branch-override: default - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': - pipeline: gate - node: ubuntu-trusty - coe: 'swarm' - special: '' - job-suffix: '' - branch-override: default - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': - pipeline: gate - node: ubuntu-trusty - coe: 'mesos' - special: '' - job-suffix: '' - branch-override: default - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': - pipeline: gate - node: ubuntu-trusty + node: + - ubuntu-trusty + - ubuntu-xenial coe: 'api' special: '-identity-v3-only' job-suffix: '-nv' branch-override: default - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': + - '{pipeline}-functional-dsvm-magnum-{coe}{special}-{node}{job-suffix}': pipeline: gate node: ubuntu-trusty - coe: 'k8s' + node: ubuntu-xenial + coe: + - 'k8s' + - 'swarm' special: '-ironic' job-suffix: '-nv' branch-override: default - - '{pipeline}-functional-dsvm-magnum-{coe}{special}{job-suffix}': - pipeline: gate - node: ubuntu-trusty - coe: 'swarm' - special: '-ironic' - job-suffix: '-nv' - branch-override: default - - '{pipeline}-magnum-dib-buildimage-{image-name}': + - '{pipeline}-magnum-dib-buildimage-{image-name}-{node}': pipeline: periodic - node: ubuntu-trusty - image-name: 'fedora-atomic-24' - branch-override: default - - '{pipeline}-magnum-dib-buildimage-{image-name}': - pipeline: periodic - node: ubuntu-trusty - image-name: 'ubuntu-mesos' + node: ubuntu-xenial + image-name: + - 'fedora-atomic-24' + - 'ubuntu-mesos' branch-override: default - api-ref-jobs: service: container-infrastructure-management diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 41c5cd0b5c..bdfb051263 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2018,8 +2018,13 @@ jobs: - ^.*\.rst$ - ^doc/.*$ - - name: gate-functional-dsvm-magnum-k8s - branch: ^(?!stable/liberty).*$ + - name: ^gate-functional-dsvm-magnum-k8s.*-ubuntu-trusty(-nv)? + branch: ^stable/mitaka$ + + # Fall through to handle skip if for both trusty and xenial + # NOTE(yuanying): ironic isn't supported in liberty or mitaka. + # We only have a xenial job for it which doesn't run on liberty or mitaka. + - name: ^gate-functional-dsvm-magnum-k8s.* skip-if: - project: ^openstack/magnum$ all-files-match-any: @@ -2028,19 +2033,13 @@ jobs: - ^magnum/drivers/swarm.*$ - ^magnum/drivers/mesos.*$ - # NOTE(yuanying): ironic isn't supported in liberty or mitaka - - name: ^gate-functional-dsvm-magnum-k8s-ironic.* - branch: ^(?!stable/(liberty|mitaka)).*$ - skip-if: - - project: ^openstack/magnum$ - all-files-match-any: - - ^.*\.rst$ - - ^doc/.*$ - - ^magnum/drivers/swarm.*$ - - ^magnum/drivers/mesos.*$ + - name: ^gate-functional-dsvm-magnum-swarm.*-ubuntu-trusty(-nv)? + branch: ^stable/mitaka$ - - name: gate-functional-dsvm-magnum-swarm - branch: ^(?!stable/liberty).*$ + # Fall through to handle skip if for both trusty and xenial + # NOTE(yuanying): ironic isn't supported in liberty or mitaka + # We only have a xenial job for it which doesn't run on liberty or mitaka. + - name: ^gate-functional-dsvm-magnum-swarm.* skip-if: - project: ^openstack/magnum$ all-files-match-any: @@ -2049,19 +2048,11 @@ jobs: - ^magnum/drivers/k8s.*$ - ^magnum/drivers/mesos.*$ - # NOTE(yuanying): ironic isn't supported in liberty or mitaka - - name: ^gate-functional-dsvm-magnum-swarm-ironic.* - branch: ^(?!stable/(liberty|mitaka)).*$ - skip-if: - - project: ^openstack/magnum$ - all-files-match-any: - - ^.*\.rst$ - - ^doc/.*$ - - ^magnum/drivers/k8s.*$ - - ^magnum/drivers/mesos.*$ + - name: ^gate-functional-dsvm-magnum-mesos.*-ubuntu-trusty(-nv)? + branch: ^stable/mitaka$ - - name: gate-functional-dsvm-magnum-mesos - branch: ^(?!stable/liberty).*$ + # Fall through to handle skip if for both trusty and xenial + - name: ^gate-functional-dsvm-magnum-mesos.* skip-if: - project: ^openstack/magnum$ all-files-match-any: @@ -11013,23 +11004,32 @@ projects: - name: install-guide-jobs - name: api-ref-jobs check: - - gate-functional-dsvm-magnum-api - - gate-functional-dsvm-magnum-k8s - - gate-functional-dsvm-magnum-swarm - - gate-functional-dsvm-magnum-mesos - - gate-functional-dsvm-magnum-api-identity-v3-only-nv - - gate-functional-dsvm-magnum-k8s-ironic-nv - - gate-functional-dsvm-magnum-swarm-ironic-nv + - gate-functional-dsvm-magnum-api-ubuntu-trusty + - gate-functional-dsvm-magnum-api-ubuntu-xenial + - gate-functional-dsvm-magnum-k8s-ubuntu-trusty + - gate-functional-dsvm-magnum-k8s-ubuntu-xenial + - gate-functional-dsvm-magnum-swarm-ubuntu-trusty + - gate-functional-dsvm-magnum-swarm-ubuntu-xenial + - gate-functional-dsvm-magnum-mesos-ubuntu-trusty + - gate-functional-dsvm-magnum-mesos-ubuntu-xenial + - gate-functional-dsvm-magnum-api-identity-v3-only-ubuntu-trusty-nv + - gate-functional-dsvm-magnum-api-identity-v3-only-ubuntu-xenial-nv + - gate-functional-dsvm-magnum-k8s-ironic-ubuntu-xenial-nv + - gate-functional-dsvm-magnum-swarm-ironic-ubuntu-xenial-nv - magnum-coverage-ubuntu-trusty - magnum-coverage-ubuntu-xenial gate: - - gate-functional-dsvm-magnum-api - - gate-functional-dsvm-magnum-k8s - - gate-functional-dsvm-magnum-swarm - - gate-functional-dsvm-magnum-mesos + - gate-functional-dsvm-magnum-api-ubuntu-trusty + - gate-functional-dsvm-magnum-api-ubuntu-xenial + - gate-functional-dsvm-magnum-k8s-ubuntu-trusty + - gate-functional-dsvm-magnum-k8s-ubuntu-xenial + - gate-functional-dsvm-magnum-swarm-ubuntu-trusty + - gate-functional-dsvm-magnum-swarm-ubuntu-xenial + - gate-functional-dsvm-magnum-mesos-ubuntu-trusty + - gate-functional-dsvm-magnum-mesos-ubuntu-xenial periodic: - - periodic-magnum-dib-buildimage-fedora-atomic-24 - - periodic-magnum-dib-buildimage-ubuntu-mesos + - periodic-magnum-dib-buildimage-fedora-atomic-24-ubuntu-xenial + - periodic-magnum-dib-buildimage-ubuntu-mesos-ubuntu-xenial - name: openstack/magnum-specs template: