From 714eeec55630042f1106985216e111dfda95cc8f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 1 Sep 2016 16:07:43 -0700 Subject: [PATCH] Run requirements/pbr integration on xenial This runs the requirements and pbr integration tests on ubuntu xenial to continue moving more tests to xenial by default during the newton dev cycle. Change-Id: Ia139c66e4e1daadae107b2fcdd0768d8d36bc984 --- jenkins/jobs/projects.yaml | 24 ++++++++++++++++++++---- jenkins/jobs/requirements.yaml | 4 ++-- zuul/layout.yaml | 33 ++++++++++++++++++++++----------- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 104fd97acd..10b992e128 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -11941,22 +11941,38 @@ name: requirements-jobs jobs: - - '{pipeline}-requirements-integration-dsvm{variant}': + - '{pipeline}-requirements-integration-dsvm{variant}-{node}': pipeline: gate node: ubuntu-trusty variant: '' - - '{pipeline}-requirements-integration-dsvm{variant}': + - '{pipeline}-requirements-integration-dsvm{variant}-{node}': pipeline: gate node: ubuntu-trusty variant: '-resolver' - - '{pipeline}-pbr-installation-dsvm{variant}': + - '{pipeline}-pbr-installation-dsvm{variant}-{node}': pipeline: gate node: ubuntu-trusty variant: '' - - '{pipeline}-pbr-installation-dsvm{variant}': + - '{pipeline}-pbr-installation-dsvm{variant}-{node}': pipeline: gate node: ubuntu-trusty variant: '-upstream' + - '{pipeline}-requirements-integration-dsvm{variant}-{node}': + pipeline: gate + node: ubuntu-xenial + variant: '' + - '{pipeline}-requirements-integration-dsvm{variant}-{node}': + pipeline: gate + node: ubuntu-xenial + variant: '-resolver' + - '{pipeline}-pbr-installation-dsvm{variant}-{node}': + pipeline: gate + node: ubuntu-xenial + variant: '' + - '{pipeline}-pbr-installation-dsvm{variant}-{node}': + pipeline: gate + node: ubuntu-xenial + variant: '-upstream' - project: name: reviewday diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml index 64c030886a..5b155e3482 100644 --- a/jenkins/jobs/requirements.yaml +++ b/jenkins/jobs/requirements.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-requirements-integration-dsvm{variant}' + name: '{pipeline}-requirements-integration-dsvm{variant}-{node}' node: '{node}' wrappers: @@ -131,7 +131,7 @@ - console-log - job-template: - name: '{pipeline}-pbr-installation-dsvm{variant}' + name: '{pipeline}-pbr-installation-dsvm{variant}-{node}' node: '{node}' wrappers: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 55853c2952..8b7fc65e5c 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1666,7 +1666,10 @@ jobs: - name: ^gate-puppet-openstack-integration-4-.*-nv$ branch: ^(?!stable/(liberty|mitaka|hammer)).*$ - - name: gate-requirements-integration-dsvm-resolver + - name: gate-requirements-integration-dsvm-resolver-ubuntu-trusty + voting: false + + - name: gate-requirements-integration-dsvm-resolver-ubuntu-xenial voting: false - name: ^gate-requirements-tox-validate-ubuntu-xenial$ @@ -3441,13 +3444,16 @@ projects: - name: lib-forward-testing - name: pypy-jobs check: - - gate-pbr-installation-dsvm - - gate-pbr-installation-dsvm-upstream + - gate-pbr-installation-dsvm-ubuntu-trusty + - gate-pbr-installation-dsvm-upstream-ubuntu-trusty + - gate-pbr-installation-dsvm-ubuntu-xenial + - gate-pbr-installation-dsvm-upstream-ubuntu-xenial gate: - - gate-pbr-installation-dsvm + - gate-pbr-installation-dsvm-ubuntu-trusty + - gate-pbr-installation-dsvm-ubuntu-xenial periodic: - - gate-pbr-installation-dsvm - - gate-pbr-installation-dsvm-upstream + - gate-pbr-installation-dsvm-ubuntu-xenial + - gate-pbr-installation-dsvm-upstream-ubuntu-xenial post: - pbr-coverage-ubuntu-trusty - pbr-coverage-ubuntu-xenial @@ -4574,11 +4580,13 @@ projects: check: - gate-pypi-mirror-pep8-ubuntu-trusty - gate-pypi-mirror-pep8-ubuntu-xenial - - gate-requirements-integration-dsvm + - gate-requirements-integration-dsvm-ubuntu-trusty + - gate-requirements-integration-dsvm-ubuntu-xenial gate: - gate-pypi-mirror-pep8-ubuntu-trusty - gate-pypi-mirror-pep8-ubuntu-xenial - - gate-requirements-integration-dsvm + - gate-requirements-integration-dsvm-ubuntu-trusty + - gate-requirements-integration-dsvm-ubuntu-xenial - name: openstack-infra/python-storyboardclient template: @@ -14575,8 +14583,10 @@ projects: - gate-requirements-docs-ubuntu-xenial - gate-requirements-pep8-ubuntu-xenial - gate-requirements-python27-ubuntu-xenial - - gate-requirements-integration-dsvm - - gate-requirements-integration-dsvm-resolver + - gate-requirements-integration-dsvm-ubuntu-trusty + - gate-requirements-integration-dsvm-ubuntu-xenial + - gate-requirements-integration-dsvm-resolver-ubuntu-trusty + - gate-requirements-integration-dsvm-resolver-ubuntu-xenial - gate-requirements-tox-babel-ubuntu-xenial - gate-requirements-tox-py27-with-upper-constraints-ubuntu-trusty - gate-requirements-tox-py27-with-upper-constraints-ubuntu-xenial @@ -14598,7 +14608,8 @@ projects: - gate-requirements-docs-ubuntu-xenial - gate-requirements-pep8-ubuntu-xenial - gate-requirements-python27-ubuntu-xenial - - gate-requirements-integration-dsvm + - gate-requirements-integration-dsvm-ubuntu-trusty + - gate-requirements-integration-dsvm-ubuntu-xenial - gate-requirements-tox-babel-ubuntu-xenial - gate-requirements-tox-validate-ubuntu-trusty - gate-requirements-tox-validate-ubuntu-xenial