From f8a44ea4994c59cc43b20e79d175360e1df1543c Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 20 Sep 2016 14:11:48 +0200 Subject: [PATCH] aodh: run MySQL and PostgreSQL jobs on Xenial starting with Ocata Change-Id: Ic3cd1b416e8e31ec4ebc7dce34a32ab51fbdb099 --- jenkins/jobs/aodh.yaml | 4 ++-- jenkins/jobs/projects.yaml | 16 ++++++++++------ zuul/layout.yaml | 24 ++++++++++++++---------- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/jenkins/jobs/aodh.yaml b/jenkins/jobs/aodh.yaml index 86dbd059f8..ecb7f16ad0 100644 --- a/jenkins/jobs/aodh.yaml +++ b/jenkins/jobs/aodh.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-aodh-dsvm-functional-{backend}' + name: '{pipeline}-aodh-dsvm-functional-{backend}-{node}' node: '{node}' wrappers: @@ -39,7 +39,7 @@ - job-template: name: 'gate-aodh-dsvm-tempest-plugin-{backend}{network}' - node: ubuntu-trusty + node: ubuntu-xenial wrappers: - build-timeout: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 288ae8ef9d..e6ec9219b6 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -153,19 +153,23 @@ - openstack-publish-jobs - translation-jobs - openstack-releasenotes-jobs - - '{pipeline}-aodh-dsvm-functional-{backend}': + - '{pipeline}-aodh-dsvm-functional-{backend}-{node}': node: ubuntu-trusty pipeline: gate backend: hbase - - '{pipeline}-aodh-dsvm-functional-{backend}': - node: ubuntu-trusty + - '{pipeline}-aodh-dsvm-functional-{backend}-{node}': + node: + - ubuntu-trusty + - ubuntu-xenial pipeline: gate backend: mysql - - '{pipeline}-aodh-dsvm-functional-{backend}': - node: ubuntu-trusty + - '{pipeline}-aodh-dsvm-functional-{backend}-{node}': + node: + - ubuntu-trusty + - ubuntu-xenial pipeline: gate backend: postgresql - - '{pipeline}-aodh-dsvm-functional-{backend}': + - '{pipeline}-aodh-dsvm-functional-{backend}-{node}': node: ubuntu-trusty pipeline: gate backend: mongodb diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 67966a7f6a..0db97113c8 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2901,10 +2901,10 @@ jobs: - name: ^gate-tempest-dsvm-lvm-multibackend branch: ^(?!stable/(liberty|mitaka)).*$ - - name: gate-aodh-dsvm-functional-hbase + - name: gate-aodh-dsvm-functional-hbase-ubuntu-trusty branch: ^stable/(mitaka|newton) - - name: gate-aodh-dsvm-functional-mongodb + - name: gate-aodh-dsvm-functional-mongodb-ubuntu-trusty branch: ^stable/(liberty|mitaka|newton) - name: gate-aodh-dsvm-tempest-plugin-hbase @@ -5218,10 +5218,12 @@ projects: - name: publish-to-pypi - name: install-guide-jobs check: - - gate-aodh-dsvm-functional-hbase - - gate-aodh-dsvm-functional-mongodb - - gate-aodh-dsvm-functional-mysql - - gate-aodh-dsvm-functional-postgresql + - gate-aodh-dsvm-functional-hbase-ubuntu-trusty + - gate-aodh-dsvm-functional-mongodb-ubuntu-trusty + - gate-aodh-dsvm-functional-mysql-ubuntu-trusty + - gate-aodh-dsvm-functional-postgresql-ubuntu-trusty + - gate-aodh-dsvm-functional-mysql-ubuntu-xenial + - gate-aodh-dsvm-functional-postgresql-ubuntu-xenial - gate-aodh-dsvm-tempest-plugin-hbase - gate-aodh-dsvm-tempest-plugin-mongodb - gate-aodh-dsvm-tempest-plugin-mysql @@ -5230,10 +5232,12 @@ projects: - gate-telemetry-dsvm-integration-aodh-ubuntu-trusty - gate-telemetry-dsvm-integration-aodh-ubuntu-xenial gate: - - gate-aodh-dsvm-functional-hbase - - gate-aodh-dsvm-functional-mongodb - - gate-aodh-dsvm-functional-mysql - - gate-aodh-dsvm-functional-postgresql + - gate-aodh-dsvm-functional-hbase-ubuntu-trusty + - gate-aodh-dsvm-functional-mongodb-ubuntu-trusty + - gate-aodh-dsvm-functional-mysql-ubuntu-trusty + - gate-aodh-dsvm-functional-postgresql-ubuntu-trusty + - gate-aodh-dsvm-functional-mysql-ubuntu-xenial + - gate-aodh-dsvm-functional-postgresql-ubuntu-xenial - gate-telemetry-dsvm-integration-aodh-ubuntu-trusty - gate-telemetry-dsvm-integration-aodh-ubuntu-xenial