Convert Designate jobs to Xenial
This is part of the Trusty to Xenial transition. For changes against
branches >= newton run on Xenial. Older branches continue to run on
Trusty.
Note that this updates jobs to use use the pdns4 driver on Xenial as the
powerdns driver is for older versions of powerdns.
Also this updates the designate grenade jobs which have the following
layout:
Trusty:
mitaka -> newton
Xenial
newton -> master/ocata
Change-Id: I1fc6c629364336418733fcf2564c2c28b5589dcb
This commit is contained in:
Clark Boylan
parent
388decb5b8
commit
ee35518b64
|
|
@ -1,7 +1,6 @@
|
|||
# Job for Designate+Tempest
|
||||
- job-template:
|
||||
name: 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}'
|
||||
|
||||
name: 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
|
@ -60,8 +59,7 @@
|
|||
|
||||
# Job for Designate+Tempest with an Agent based Backend
|
||||
- job-template:
|
||||
name: 'gate-tempest-dsvm-designate-agent-{designate-driver}{job-suffix}'
|
||||
|
||||
name: 'gate-tempest-dsvm-designate-agent-{designate-driver}-{node}{job-suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
|
@ -107,7 +105,7 @@
|
|||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: 'gate-grenade-dsvm-designate-{designate-driver}{job-suffix}'
|
||||
name: 'gate-grenade-dsvm-designate-{designate-driver}-{node}{job-suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
|
@ -154,8 +152,7 @@
|
|||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: 'gate-designate-dsvm-{designate-driver}'
|
||||
|
||||
name: 'gate-designate-dsvm-{designate-driver}-{node}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
|
|
|||
|
|
@ -3641,7 +3641,7 @@
|
|||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
job-suffix: '-nv'
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
branch-override: default
|
||||
special: ''
|
||||
|
|
@ -3649,7 +3649,15 @@
|
|||
designate-driver:
|
||||
- powerdns
|
||||
- bind9
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}':
|
||||
node: ubuntu-xenial
|
||||
branch-override: default
|
||||
special: ''
|
||||
job-suffix: ''
|
||||
designate-driver:
|
||||
- pdns4
|
||||
- bind9
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
branch-override: stable/mitaka
|
||||
special: ''
|
||||
|
|
@ -3657,49 +3665,55 @@
|
|||
designate-driver:
|
||||
- powerdns
|
||||
- bind9
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
# This job is xenial only because it is pinned to >= newton.
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}':
|
||||
node: ubuntu-xenial
|
||||
branch-override: default
|
||||
special: '-postgres'
|
||||
job-suffix: '-nv'
|
||||
designate-driver:
|
||||
- powerdns
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
- pdns4
|
||||
# This job is xenial only because it is pinned to >= newton.
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}':
|
||||
node: ubuntu-xenial
|
||||
branch-override: default
|
||||
special: '-worker-model'
|
||||
job-suffix: '-nv'
|
||||
designate-driver:
|
||||
- powerdns
|
||||
- 'gate-tempest-dsvm-designate-agent-{designate-driver}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
- pdns4
|
||||
- 'gate-tempest-dsvm-designate-agent-{designate-driver}-{node}{job-suffix}':
|
||||
node:
|
||||
- ubuntu-trusty
|
||||
- ubuntu-xenial
|
||||
branch-override: default
|
||||
job-suffix: ''
|
||||
designate-driver:
|
||||
- knot2
|
||||
- djbdns
|
||||
- gdnsd
|
||||
- 'gate-grenade-dsvm-designate-{designate-driver}{job-suffix}':
|
||||
- 'gate-grenade-dsvm-designate-{designate-driver}-{node}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
branch-override: default
|
||||
job-suffix: ''
|
||||
designate-driver:
|
||||
- powerdns
|
||||
# Legacy Job
|
||||
- 'gate-designate-dsvm-{designate-driver}':
|
||||
- 'gate-grenade-dsvm-designate-{designate-driver}-{node}{job-suffix}':
|
||||
node: ubuntu-xenial
|
||||
branch-override: default
|
||||
job-suffix: ''
|
||||
designate-driver:
|
||||
- pdns4
|
||||
# Legacy Jobs that only run against liberty and mitaka (no xenial).
|
||||
- 'gate-designate-dsvm-{designate-driver}-{node}':
|
||||
node: ubuntu-trusty
|
||||
designate-driver:
|
||||
- powerdns
|
||||
- bind9
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
|
||||
node: ubuntu-trusty
|
||||
special: '-identity-v3-only'
|
||||
job-suffix: '-nv'
|
||||
designate-driver: 'powerdns'
|
||||
branch-override: default
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}{job-suffix}':
|
||||
# identity-v3-only only started running in newton/ocata timeframe so is
|
||||
# xenial only, not trusty.
|
||||
- 'gate-tempest-dsvm-designate-{designate-driver}{special}-{node}{job-suffix}':
|
||||
node: ubuntu-xenial
|
||||
special: ''
|
||||
special: '-identity-v3-only'
|
||||
job-suffix: '-nv'
|
||||
designate-driver: 'pdns4'
|
||||
branch-override: default
|
||||
|
|
|
|||
|
|
@ -1078,29 +1078,39 @@ project-templates:
|
|||
|
||||
- name: designate-dsvm-jobs
|
||||
check:
|
||||
# Remove the two jobs below when Mitaka is EOL
|
||||
- gate-designate-dsvm-powerdns
|
||||
- gate-designate-dsvm-bind9
|
||||
- gate-tempest-dsvm-designate-powerdns
|
||||
- gate-tempest-dsvm-designate-bind9
|
||||
- gate-tempest-dsvm-designate-powerdns-postgres-nv
|
||||
- gate-tempest-dsvm-designate-powerdns-worker-model-nv
|
||||
# Remove the two jobs below when Mitaka is EOL (they only run against
|
||||
# liberty and mitaka.
|
||||
- gate-designate-dsvm-powerdns-ubuntu-trusty
|
||||
- gate-designate-dsvm-bind9-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-powerdns-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-pdns4-ubuntu-xenial
|
||||
- gate-tempest-dsvm-designate-bind9-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-bind9-ubuntu-xenial
|
||||
- gate-tempest-dsvm-designate-pdns4-postgres-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-designate-pdns4-worker-model-ubuntu-xenial-nv
|
||||
- gate-rally-dsvm-designate-designate-ubuntu-trusty-nv
|
||||
- gate-rally-dsvm-designate-designate-ubuntu-xenial-nv
|
||||
- gate-grenade-dsvm-designate-powerdns
|
||||
- gate-tempest-dsvm-designate-pdns4-nv
|
||||
- gate-tempest-dsvm-designate-powerdns-identity-v3-only-nv
|
||||
- gate-grenade-dsvm-designate-powerdns-ubuntu-trusty
|
||||
- gate-grenade-dsvm-designate-pdns4-ubuntu-xenial
|
||||
- gate-tempest-dsvm-designate-pdns4-identity-v3-only-ubuntu-xenial-nv
|
||||
gate:
|
||||
# Remove the two jobs below when Mitaka is EOL
|
||||
- gate-designate-dsvm-powerdns
|
||||
- gate-designate-dsvm-bind9
|
||||
- gate-tempest-dsvm-designate-powerdns
|
||||
- gate-tempest-dsvm-designate-bind9
|
||||
- gate-grenade-dsvm-designate-powerdns
|
||||
# Remove the two jobs below when Mitaka is EOL (they only run against
|
||||
# liberty and mitaka.
|
||||
- gate-designate-dsvm-powerdns-ubuntu-trusty
|
||||
- gate-designate-dsvm-bind9-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-powerdns-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-pdns4-ubuntu-xenial
|
||||
- gate-tempest-dsvm-designate-bind9-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-bind9-ubuntu-xenial
|
||||
- gate-grenade-dsvm-designate-powerdns-ubuntu-trusty
|
||||
- gate-grenade-dsvm-designate-pdns4-ubuntu-xenial
|
||||
experimental:
|
||||
- gate-tempest-dsvm-designate-agent-knot2
|
||||
- gate-tempest-dsvm-designate-agent-djbdns
|
||||
- gate-tempest-dsvm-designate-agent-gdnsd
|
||||
- gate-tempest-dsvm-designate-agent-knot2-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-agent-knot2-ubuntu-xenial
|
||||
- gate-tempest-dsvm-designate-agent-djbdns-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-agent-djbdns-ubuntu-xenial
|
||||
- gate-tempest-dsvm-designate-agent-gdnsd-ubuntu-trusty
|
||||
- gate-tempest-dsvm-designate-agent-gdnsd-ubuntu-xenial
|
||||
|
||||
- name: nodejs4-jobs
|
||||
check:
|
||||
|
|
@ -2595,26 +2605,17 @@ jobs:
|
|||
- name: gate-designate-python34-db
|
||||
branch: ^(?!stable/liberty).*$
|
||||
|
||||
- name: ^gate-tempest-dsvm-designate-.*$
|
||||
branch: ^(?!stable/liberty).*$
|
||||
- name: ^gate-tempest-dsvm-designate-.*-ubuntu-trusty(-nv)?$
|
||||
branch: ^stable/mitaka$
|
||||
|
||||
# These are legacy jobs that need to run against liberty and mitaka branches
|
||||
- name: ^gate-designate-dsvm-.*$
|
||||
branch: ^(stable/(liberty|mitaka)).*$
|
||||
|
||||
# This job should only be ran on newton onwards
|
||||
- name: ^gate-tempest-dsvm-designate-.*-worker-model.*$
|
||||
branch: ^(?!stable/(liberty|mitaka)).*$
|
||||
|
||||
- name: ^gate-grenade-dsvm-designate-.*$
|
||||
branch: ^(?!stable/(liberty|mitaka)).*$
|
||||
|
||||
# This overrides the above "looser" match above
|
||||
- name: ^gate-tempest-dsvm-designate-.*-mitaka$
|
||||
branch: ^master$
|
||||
|
||||
- name: ^gate-tempest-dsvm-designate-.*-postgres-nv$
|
||||
branch: ^(?!stable/(liberty|mitaka)).*$
|
||||
# Designate grenade is >= newton. Trusty pinned to newton
|
||||
# then default grenade rules will run the xenial job on
|
||||
# branches >= ocata.
|
||||
- name: ^gate-grenade-dsvm-designate-.*-ubuntu-trusty$
|
||||
branch: ^stable/newton$
|
||||
|
||||
- name: gate-congress-python34
|
||||
branch: ^(?!stable/liberty).*$
|
||||
|
|
@ -8518,14 +8519,14 @@ projects:
|
|||
- gate-designate-tempest-plugin-pep8-ubuntu-trusty
|
||||
- gate-designate-tempest-plugin-pep8-ubuntu-xenial
|
||||
# Stable Compat Jobs
|
||||
- gate-tempest-dsvm-designate-powerdns-mitaka
|
||||
- gate-tempest-dsvm-designate-bind9-mitaka
|
||||
- gate-tempest-dsvm-designate-powerdns-ubuntu-trusty-mitaka
|
||||
- gate-tempest-dsvm-designate-bind9-ubuntu-trusty-mitaka
|
||||
gate:
|
||||
- gate-designate-tempest-plugin-pep8-ubuntu-trusty
|
||||
- gate-designate-tempest-plugin-pep8-ubuntu-xenial
|
||||
# Stable Compat Jobs
|
||||
- gate-tempest-dsvm-designate-powerdns-mitaka
|
||||
- gate-tempest-dsvm-designate-bind9-mitaka
|
||||
- gate-tempest-dsvm-designate-powerdns-ubuntu-trusty-mitaka
|
||||
- gate-tempest-dsvm-designate-bind9-ubuntu-trusty-mitaka
|
||||
|
||||
- name: openstack/devstack-plugin-additional-pkg-repos
|
||||
template:
|
||||
|
|
|
|||
Loading…
Reference in New Issue