From 472ca84970422e4a234e992176695d78a8095f7b Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Thu, 17 Nov 2016 12:05:20 +0100 Subject: [PATCH] Switch heat newton jobs to use xenial Heat jobs were still using trusty, but aodh doesn't support it anymore, so let's switch to xenial on newton and earlier. Change-Id: Ib3b83cd1418fcab9079d9343802d06243b2f1c01 --- jenkins/jobs/heat.yaml | 8 +++--- jenkins/jobs/projects.yaml | 38 +++++++++++++++++---------- zuul/layout.yaml | 53 +++++++++++++++++++++++--------------- 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index 472ff62c4e..efb49130f2 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -1,6 +1,6 @@ - job: name: gate-heat-templates-dsvm - node: ubuntu-trusty + node: ubuntu-xenial wrappers: - build-timeout: @@ -32,7 +32,7 @@ - console-log - job-template: - name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}' + name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}' node: '{node}' wrappers: @@ -205,7 +205,7 @@ - job-template: - name: '{pipeline}-grenade-dsvm-heat{job-suffix}' + name: '{pipeline}-grenade-dsvm-heat-{node}{job-suffix}' node: '{node}' wrappers: @@ -262,7 +262,7 @@ - console-log - job-template: - name: '{pipeline}-tempest-dsvm-heat-apache{job-suffix}' + name: '{pipeline}-tempest-dsvm-heat-apache-{node}{job-suffix}' node: '{node}' wrappers: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 8e36079827..59fc4301b9 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5231,7 +5231,7 @@ - translation-jobs-newton - 'gate-{name}-python35-db{suffix}': suffix: '' - - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}': + - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}': datastore: mysql pipeline: gate node: ubuntu-trusty @@ -5240,17 +5240,19 @@ branch-override: default engine: orig lbaasversion: lbaasv1 - - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}': + - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}': datastore: mysql pipeline: gate - node: ubuntu-trusty + node: + - ubuntu-trusty + - ubuntu-xenial special: '' job-suffix: '' branch-designator: '' branch-override: default engine: orig lbaasversion: lbaasv2 - - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}': + - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}': datastore: postgres pipeline: gate node: ubuntu-trusty @@ -5259,7 +5261,7 @@ branch-override: default engine: orig lbaasversion: lbaasv1 - - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}': + - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}': datastore: mysql pipeline: gate node: ubuntu-trusty @@ -5268,16 +5270,18 @@ branch-override: default engine: convg lbaasversion: lbaasv1 - - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}': + - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}': datastore: mysql pipeline: gate - node: ubuntu-trusty + node: + - ubuntu-trusty + - ubuntu-xenial special: '' job-suffix: '' branch-override: default engine: convg lbaasversion: lbaasv2 - - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}': + - '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}': datastore: mysql pipeline: gate node: ubuntu-trusty @@ -5298,19 +5302,25 @@ special: '-identity-v3-only' job-suffix: '-nv' branch-override: default - - '{pipeline}-tempest-dsvm-heat-apache{job-suffix}': + - '{pipeline}-tempest-dsvm-heat-apache-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty + node: + - ubuntu-trusty + - ubuntu-xenial job-suffix: '' branch-override: default - - '{pipeline}-grenade-dsvm-heat{job-suffix}': + - '{pipeline}-grenade-dsvm-heat-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty + node: + - ubuntu-trusty + - ubuntu-xenial job-suffix: '' branch-override: default - - '{pipeline}-grenade-dsvm-heat{job-suffix}': + - '{pipeline}-grenade-dsvm-heat-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty + node: + - ubuntu-trusty + - ubuntu-xenial job-suffix: '-nv' branch-override: default - gate-rally-dsvm-fakevirt-{name} diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4c8bc9302e..6b3c44b652 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1882,27 +1882,30 @@ jobs: # NOTE(markvan) (heat) functional lbaas v2 testing was introduced in the mitaka # cycle as experimental, so testing it there and earlier branches doesn't make sense. - - name: ^gate-heat-dsvm-functional-.*-lbaasv2$ + - name: ^gate-heat-dsvm-functional-.*-lbaasv2-ubuntu-xenial$ branch: ^(?!stable/(liberty|mitaka)).*$ # NOTE(therve) (heat) functional lbaas v1 testing is deprecated in newton and # forward. - - name: ^gate-heat-dsvm-functional-.*-lbaasv1$ + - name: ^gate-heat-dsvm-functional-.*-lbaasv1-ubuntu-trusty$ branch: ^(stable/(liberty|mitaka)).*$ # NOTE(therve) (heat) only run convergence lbaasv1 on mitaka - - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv1$ + - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv1-ubuntu-trusty$ branch: ^(stable/mitaka).*$ # NOTE(therve) (heat) run convergence lbaasv2 newton and forward - - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2$ + - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial$ branch: ^(?!stable/(liberty|mitaka)).*$ - name: gate-tempest-dsvm-heat branch: ^(stable/liberty).*$ - - name: gate-tempest-dsvm-heat-apache - branch: ^(?!stable/liberty).*$ + - name: gate-tempest-dsvm-heat-apache-ubuntu-trusty + branch: ^(stable/mitaka).*$ + + - name: gate-tempest-dsvm-heat-apache-ubuntu-xenial + branch: ^(?!stable/(liberty|mitaka)).*$ - name: ^gate-networking-cisco-compare-coverage-ubuntu-xenial$ voting: false @@ -3631,7 +3634,7 @@ projects: - gate-grenade-dsvm-neutron-ubuntu-trusty - gate-grenade-dsvm-neutron-ubuntu-xenial - gate-grenade-dsvm-forward - - gate-grenade-dsvm-heat-nv + - gate-grenade-dsvm-heat-ubuntu-xenial-nv - gate-grenade-dsvm-multinode - gate-grenade-dsvm-neutron-multinode-ubuntu-trusty - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial @@ -10147,31 +10150,39 @@ projects: - name: api-ref-jobs - name: install-guide-jobs check: - - gate-heat-dsvm-functional-orig-mysql-lbaasv1 - - gate-heat-dsvm-functional-convg-mysql-lbaasv1 - - gate-heat-dsvm-functional-orig-mysql-lbaasv2 - - gate-heat-dsvm-functional-convg-mysql-lbaasv2 + - gate-heat-dsvm-functional-orig-mysql-lbaasv1-ubuntu-trusty + - gate-heat-dsvm-functional-convg-mysql-lbaasv1-ubuntu-trusty + - gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-trusty + - gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-xenial + - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-trusty + - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial - gate-tempest-dsvm-heat - - gate-tempest-dsvm-heat-apache - - gate-grenade-dsvm-heat + - gate-tempest-dsvm-heat-apache-ubuntu-trusty + - gate-tempest-dsvm-heat-apache-ubuntu-xenial + - gate-grenade-dsvm-heat-ubuntu-trusty + - gate-grenade-dsvm-heat-ubuntu-xenial - gate-tempest-dsvm-heat-identity-v3-only-nv gate: - - gate-heat-dsvm-functional-orig-mysql-lbaasv1 - - gate-heat-dsvm-functional-convg-mysql-lbaasv1 - - gate-heat-dsvm-functional-orig-mysql-lbaasv2 - - gate-heat-dsvm-functional-convg-mysql-lbaasv2 + - gate-heat-dsvm-functional-orig-mysql-lbaasv1-ubuntu-trusty + - gate-heat-dsvm-functional-convg-mysql-lbaasv1-ubuntu-trusty + - gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-trusty + - gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-xenial + - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-trusty + - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial - gate-tempest-dsvm-heat - - gate-tempest-dsvm-heat-apache - - gate-grenade-dsvm-heat + - gate-tempest-dsvm-heat-apache-ubuntu-trusty + - gate-tempest-dsvm-heat-apache-ubuntu-xenial + - gate-grenade-dsvm-heat-ubuntu-trusty + - gate-grenade-dsvm-heat-ubuntu-xenial post: - heat-coverage-db-ubuntu-trusty - heat-coverage-db-ubuntu-xenial periodic: - gate-rally-dsvm-fakevirt-heat experimental: - - gate-heat-dsvm-functional-orig-mysql-lbaasv1-identity-v3-only-nv + - gate-heat-dsvm-functional-orig-mysql-lbaasv1-ubuntu-trusty-identity-v3-only-nv - gate-rally-dsvm-fakevirt-heat - - gate-heat-dsvm-functional-orig-postgres-lbaasv1 + - gate-heat-dsvm-functional-orig-postgres-lbaasv1-ubuntu-trusty - gate-tripleo-ci-centos-7-nonha-multinode - name: openstack/heat-cfntools