Update jenkins jobs to optionally allow trusty
Now that zuul is selecting the node label for all jobs we can make trusty an option for all dsvm jobs. A subsequent change will update zuul to select trusty nodes. We are staggering the changes to avoid races between zuul and jenkins config updates. Change-Id: If3abb111f9378c192e647ceaced5bc9b16fe6bb4
This commit is contained in:
parent
aa1673a656
commit
f8094fd62a
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-barbican-devstack-dsvm
|
name: gate-barbican-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-blazar-devstack-dsvm
|
name: gate-blazar-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-designate-devstack-dsvm
|
name: gate-designate-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-heat-templates-dsvm
|
name: gate-heat-templates-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-magnetodb-devstack-dsvm
|
name: gate-magnetodb-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-manila-tempest-dsvm-neutron
|
name: gate-manila-tempest-dsvm-neutron
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: gate-manila-tempest-dsvm-neutron-multibackend
|
name: gate-manila-tempest-dsvm-neutron-multibackend
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-mistral-devstack-dsvm
|
name: gate-mistral-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-murano-devstack-dsvm
|
name: gate-murano-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -55,11 +55,11 @@
|
||||||
jobs:
|
jobs:
|
||||||
- '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
|
- '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
|
- '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
|
|
|
@ -306,12 +306,12 @@
|
||||||
env: 27sa07
|
env: 27sa07
|
||||||
- '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}':
|
- '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}':
|
- '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: 'devstack-precise'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- hook-{name}-rtfd
|
- hook-{name}-rtfd
|
||||||
|
@ -1105,27 +1105,27 @@
|
||||||
- translation-jobs
|
- translation-jobs
|
||||||
- '{pipeline}-neutron-dsvm-functional{branch-designator}':
|
- '{pipeline}-neutron-dsvm-functional{branch-designator}':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-neutron-dsvm-functional{branch-designator}':
|
- '{pipeline}-neutron-dsvm-functional{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-neutron-dsvm-api{branch-designator}':
|
- '{pipeline}-neutron-dsvm-api{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-2'
|
branch-designator: '-2'
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-2'
|
branch-designator: '-2'
|
||||||
branch-override: default
|
branch-override: default
|
||||||
|
|
||||||
|
@ -1411,17 +1411,17 @@
|
||||||
envlist: func
|
envlist: func
|
||||||
- '{pipeline}-swift-dsvm-functional{branch-designator}':
|
- '{pipeline}-swift-dsvm-functional{branch-designator}':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-swift-dsvm-functional{branch-designator}':
|
- '{pipeline}-swift-dsvm-functional{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-swift-dsvm-functional{branch-designator}':
|
- '{pipeline}-swift-dsvm-functional{branch-designator}':
|
||||||
pipeline: periodic
|
pipeline: periodic
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-havana'
|
branch-designator: '-havana'
|
||||||
branch-override: stable/havana
|
branch-override: stable/havana
|
||||||
# No one is interested in stable/ branches on swift, so don't run bitrot jobs
|
# No one is interested in stable/ branches on swift, so don't run bitrot jobs
|
||||||
|
@ -1447,61 +1447,50 @@
|
||||||
# Normal gate and check jobs
|
# Normal gate and check jobs
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: ''
|
|
||||||
branch-override: default
|
|
||||||
- devstack-jobs:
|
|
||||||
pipeline: experimental
|
|
||||||
node: 'dsvm-precise-krnl'
|
|
||||||
branch-designator: ''
|
branch-designator: ''
|
||||||
branch-override: default
|
branch-override: default
|
||||||
# Stable gate jobs for branchless tempest
|
# Stable gate jobs for branchless tempest
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-icehouse'
|
branch-designator: '-icehouse'
|
||||||
branch-override: stable/icehouse
|
branch-override: stable/icehouse
|
||||||
# Stable check jobs for testing devstack gate
|
# Stable check jobs for testing devstack gate
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-havana'
|
branch-designator: '-havana'
|
||||||
branch-override: stable/havana
|
branch-override: stable/havana
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-icehouse'
|
branch-designator: '-icehouse'
|
||||||
branch-override: stable/icehouse
|
branch-override: stable/icehouse
|
||||||
# Periodic jobs for various branches
|
# Periodic jobs for various branches
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: periodic
|
pipeline: periodic
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-havana'
|
branch-designator: '-havana'
|
||||||
branch-override: stable/havana
|
branch-override: stable/havana
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: periodic
|
pipeline: periodic
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-icehouse'
|
branch-designator: '-icehouse'
|
||||||
branch-override: stable/icehouse
|
branch-override: stable/icehouse
|
||||||
- devstack-jobs:
|
- devstack-jobs:
|
||||||
pipeline: periodic
|
pipeline: periodic
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-master'
|
branch-designator: '-master'
|
||||||
branch-override: master
|
branch-override: master
|
||||||
# Special jobs for devstack-gate
|
# Special jobs for devstack-gate
|
||||||
- devstack-gate-jobs:
|
- devstack-gate-jobs:
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
# Trusty node testing
|
|
||||||
- devstack-jobs:
|
|
||||||
pipeline: check
|
|
||||||
node: 'devstack-trusty'
|
|
||||||
branch-designator: '-trusty'
|
|
||||||
branch-override: default
|
|
||||||
|
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
|
@ -1518,10 +1507,10 @@
|
||||||
jobs:
|
jobs:
|
||||||
- '{pipeline}-requirements-integration-dsvm':
|
- '{pipeline}-requirements-integration-dsvm':
|
||||||
pipeline: gate
|
pipeline: gate
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
- '{pipeline}-requirements-integration-dsvm':
|
- '{pipeline}-requirements-integration-dsvm':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: tempest
|
name: tempest
|
||||||
|
@ -2086,17 +2075,17 @@
|
||||||
- translation-jobs
|
- translation-jobs
|
||||||
- '{pipeline}-tempest-dsvm-ironic{branch-designator}':
|
- '{pipeline}-tempest-dsvm-ironic{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-nv'
|
branch-designator: '-nv'
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}':
|
- '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-nv'
|
branch-designator: '-nv'
|
||||||
branch-override: default
|
branch-override: default
|
||||||
- '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}':
|
- '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}':
|
||||||
pipeline: check
|
pipeline: check
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
branch-designator: '-nv'
|
branch-designator: '-nv'
|
||||||
branch-override: default
|
branch-override: default
|
||||||
|
|
||||||
|
@ -2341,8 +2330,6 @@
|
||||||
node: bare-precise
|
node: bare-precise
|
||||||
- gate-rally-install-{node}:
|
- gate-rally-install-{node}:
|
||||||
node: bare-centos6
|
node: bare-centos6
|
||||||
- 'check-rally-cli':
|
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: python-rallyclient
|
name: python-rallyclient
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
|
|
||||||
- job-template:
|
- job-template:
|
||||||
name: 'check-rally-dsvm-{name}'
|
name: 'check-rally-dsvm-{name}'
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
|
|
||||||
- job-template:
|
- job-template:
|
||||||
name: 'check-rally-dsvm-neutron-{name}'
|
name: 'check-rally-dsvm-neutron-{name}'
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
@ -95,8 +95,8 @@
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: 'check-rally-cli'
|
name: 'check-rally-dsvm-cli'
|
||||||
node: 'devstack-precise || devstack-precise-check'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
builders:
|
builders:
|
||||||
- link-logs
|
- link-logs
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- job:
|
- job:
|
||||||
name: gate-solum-devstack-dsvm
|
name: gate-solum-devstack-dsvm
|
||||||
node: devstack-precise
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
- job-template:
|
- job-template:
|
||||||
name: 'gate-trove-functional-dsvm-{datastore}'
|
name: 'gate-trove-functional-dsvm-{datastore}'
|
||||||
node: 'devstack-precise'
|
node: 'devstack-precise || devstack-trusty'
|
||||||
|
|
||||||
wrappers:
|
wrappers:
|
||||||
- timeout:
|
- timeout:
|
||||||
|
|
|
@ -637,7 +637,7 @@ jobs:
|
||||||
voting: false
|
voting: false
|
||||||
- name: gate-tomograph-python33
|
- name: gate-tomograph-python33
|
||||||
voting: false
|
voting: false
|
||||||
- name: check-rally-cli
|
- name: check-rally-dsvm-cli
|
||||||
voting: false
|
voting: false
|
||||||
- name: gate-stevedore-docs
|
- name: gate-stevedore-docs
|
||||||
voting: false
|
voting: false
|
||||||
|
@ -1008,8 +1008,6 @@ projects:
|
||||||
- check-neutron-dsvm-api
|
- check-neutron-dsvm-api
|
||||||
- gate-grenade-dsvm-neutron-forward
|
- gate-grenade-dsvm-neutron-forward
|
||||||
- neutron-upstream-translation-update
|
- neutron-upstream-translation-update
|
||||||
- experimental-tempest-dsvm-neutron
|
|
||||||
- experimental-tempest-dsvm-neutron-pg
|
|
||||||
experimental-tripleo:
|
experimental-tripleo:
|
||||||
- check-tripleo-ironic-seed-precise
|
- check-tripleo-ironic-seed-precise
|
||||||
- check-tripleo-undercloud-precise
|
- check-tripleo-undercloud-precise
|
||||||
|
@ -2413,9 +2411,6 @@ projects:
|
||||||
- check-tempest-master-dsvm-full-havana
|
- check-tempest-master-dsvm-full-havana
|
||||||
- check-tempest-master-dsvm-neutron-havana
|
- check-tempest-master-dsvm-neutron-havana
|
||||||
- check-tempest-dsvm-f20
|
- check-tempest-dsvm-f20
|
||||||
- check-tempest-dsvm-full-trusty
|
|
||||||
- check-tempest-dsvm-neutron-trusty
|
|
||||||
- check-grenade-dsvm-trusty
|
|
||||||
|
|
||||||
- name: openstack-dev/grenade
|
- name: openstack-dev/grenade
|
||||||
check:
|
check:
|
||||||
|
@ -2609,9 +2604,6 @@ projects:
|
||||||
- check-tempest-master-dsvm-full-havana
|
- check-tempest-master-dsvm-full-havana
|
||||||
- check-tempest-master-dsvm-neutron-havana
|
- check-tempest-master-dsvm-neutron-havana
|
||||||
- check-tempest-dsvm-f20
|
- check-tempest-dsvm-f20
|
||||||
- check-tempest-dsvm-full-trusty
|
|
||||||
- check-tempest-dsvm-neutron-trusty
|
|
||||||
- check-grenade-dsvm-trusty
|
|
||||||
experimental-tripleo:
|
experimental-tripleo:
|
||||||
- check-tripleo-ironic-seed-precise
|
- check-tripleo-ironic-seed-precise
|
||||||
- check-tripleo-undercloud-precise
|
- check-tripleo-undercloud-precise
|
||||||
|
@ -4361,7 +4353,7 @@ projects:
|
||||||
- gate-rally-install-bare-precise
|
- gate-rally-install-bare-precise
|
||||||
- check-rally-dsvm-rally
|
- check-rally-dsvm-rally
|
||||||
- check-rally-dsvm-neutron-rally
|
- check-rally-dsvm-neutron-rally
|
||||||
- check-rally-cli
|
- check-rally-dsvm-cli
|
||||||
gate:
|
gate:
|
||||||
- gate-rally-pep8
|
- gate-rally-pep8
|
||||||
- gate-rally-python26
|
- gate-rally-python26
|
||||||
|
|
Loading…
Reference in New Issue