From a9a7a5dcf18232662d969a20f8eb69678a5670fd Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 7 Dec 2016 11:33:08 -0800 Subject: [PATCH] Transition manila image build jobs to Xenial This is part of the Trusty to Xenial transition. Because manila-image-elements only has a master branch just shift the jobs ahead to run on Xenial. Change-Id: Ibde70559d20a3387c6f4356bf4450a431eeb0bf6 --- jenkins/jobs/manila.yaml | 8 ++++---- jenkins/jobs/projects.yaml | 9 ++++++--- zuul/layout.yaml | 12 ++++++------ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml index 0269f66b20..2874cdd792 100644 --- a/jenkins/jobs/manila.yaml +++ b/jenkins/jobs/manila.yaml @@ -285,8 +285,8 @@ - job-template: - name: 'gate-manila-publishimage-{image-name}' - node: ubuntu-trusty + name: 'gate-manila-publishimage-{image-name}-{node}' + node: '{node}' builders: - link-logs @@ -312,8 +312,8 @@ - console-log - job-template: - name: 'gate-manila-buildimage-{image-name}' - node: ubuntu-trusty + name: 'gate-manila-buildimage-{image-name}-{node}' + node: '{node}' builders: - link-logs diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index cc311ba999..5bb1833bcc 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6918,11 +6918,14 @@ - gate-{name}-requirements - gate-{name}-docs-{node}: node: ubuntu-xenial - - 'gate-manila-publishimage-{image-name}': + - 'gate-manila-publishimage-{image-name}-{node}': + node: ubuntu-xenial image-name: generic - - 'gate-manila-buildimage-{image-name}': + - 'gate-manila-buildimage-{image-name}-{node}': + node: ubuntu-xenial image-name: generic - - 'gate-manila-buildimage-{image-name}': + - 'gate-manila-buildimage-{image-name}-{node}': + node: ubuntu-xenial image-name: docker - project: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index bdfb051263..7aae22f2d1 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2786,7 +2786,7 @@ jobs: - name: gate-manila-pylint voting: false - - name: gate-manila-buildimage-docker + - name: gate-manila-buildimage-docker-ubuntu-xenial voting: false - name: gate-manila-tempest-dsvm-postgres-zfsonlinux-ubuntu-trusty-nv @@ -11117,16 +11117,16 @@ projects: check: - gate-manila-image-elements-pep8-ubuntu-xenial - gate-manila-image-elements-docs-ubuntu-xenial - - gate-manila-buildimage-generic - - gate-manila-buildimage-docker + - gate-manila-buildimage-generic-ubuntu-xenial + - gate-manila-buildimage-docker-ubuntu-xenial gate: - gate-manila-image-elements-pep8-ubuntu-xenial - gate-manila-image-elements-docs-ubuntu-xenial - - gate-manila-buildimage-generic + - gate-manila-buildimage-generic-ubuntu-xenial post: - - gate-manila-publishimage-generic + - gate-manila-publishimage-generic-ubuntu-xenial release: - - gate-manila-publishimage-generic + - gate-manila-publishimage-generic-ubuntu-xenial - name: openstack/manila-specs template: