Move all trusty jobs to python-jobs-trusty job group

Move trusty jobs from python-jobs to python-jobs-trusty and add the new
job-group to all repos that need them (have python-jobs and mitaka
branch).

Remove also two branch conditions that do not anymore match a job.

Change-Id: I46b0e2878e7124a640c85456307ef8278ae7289e
This commit is contained in:
Andreas Jaeger 2017-07-07 07:29:45 +02:00
parent e7706d387f
commit d28a3e5006
3 changed files with 49 additions and 16 deletions

View File

@ -705,6 +705,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: ceilometermiddleware
@ -1192,6 +1193,9 @@
jobs:
- python-jobs
# For driverfixes/mitaka branch:
- gate-{name}-pep8-{node}:
node: ubuntu-trusty
- cross-python-jobs
- python-newton-bitrot-jobs
- python-ocata-bitrot-jobs
@ -1335,6 +1339,7 @@
- openstack-publish-jobs
- openstack-releasenotes-jobs
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -1347,6 +1352,7 @@
name: cloudpulse
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -1361,6 +1367,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- '{pipeline}-dsvm-collectd-ceilometer-plugin-{install_type}-{node}{suffix}':
pipeline: gate
node:
@ -4577,6 +4584,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-devops
@ -4610,6 +4618,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-mirror
@ -4629,18 +4638,21 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-nailgun-extension-converted-serializers
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-nailgun-extension-iac
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-noop-fixtures
@ -4657,6 +4669,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- coverage-jobs
- puppet-check-jobs
- '{name}-coverage-{node}{suffix}':
@ -4668,6 +4681,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-plugins
@ -4675,12 +4689,14 @@
jobs:
- python-jobs
- pypi-jobs
- python-jobs-trusty
- project:
name: fuel-qa
jobs:
- python-jobs
- python-jobs-trusty
- gate-{name}-pylint-{node}:
node:
- ubuntu-trusty
@ -4697,6 +4713,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: fuel-ui
@ -4709,6 +4726,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: futurist
@ -5048,6 +5066,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- '{pipeline}-group-based-policy-dsvm-functional-{node}{suffix}':
pipeline: gate
@ -5081,6 +5100,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -5094,6 +5114,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -6938,6 +6959,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- 'gate-{name}-python35-nv'
- project:
@ -7175,12 +7197,14 @@
jobs:
- pypi-jobs
- python-jobs
- python-jobs-trusty
- project:
name: networking-6wind
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-ale-omniswitch
@ -7276,12 +7300,14 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-brocade
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-calico
@ -7413,6 +7439,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -7549,12 +7576,14 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-nec
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-odl
@ -7744,6 +7773,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- '{pipeline}-tempest-dsvm-networking-ovs-dpdk{suffix}':
pipeline: gate
node: ubuntu-xenial
@ -7762,6 +7792,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -7832,6 +7863,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: neutron
@ -8395,6 +8427,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: novajoin
@ -9951,6 +9984,7 @@
- scenario003
jobs:
- python-jobs
- python-jobs-trusty
- '{name}-tarball'
- '{name}-tarball-signing'
- 'gate-{name}-releasenotes'
@ -12067,12 +12101,14 @@
jobs:
- coverage-jobs
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
name: python-cloudpulseclient
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -12193,6 +12229,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -13439,6 +13476,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: shovel
@ -13727,6 +13765,7 @@
- openstack-server-release-jobs
- openstack-publish-jobs
- python-jobs
- python-jobs-trusty
- gate-storlets-functional-{node}:
node:
- ubuntu-trusty
@ -14096,6 +14135,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -14153,6 +14193,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- 'training-labs-scripts-{node}':
node:
- ubuntu-trusty
@ -14921,6 +14962,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -15294,6 +15336,7 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- hook-{name}-rtfd

View File

@ -577,13 +577,15 @@
name: python-jobs-trusty
node: ubuntu-trusty
jobs:
- 'gate-{name}-pep8-{node}'
- 'gate-{name}-python27-{node}'
- 'gate-{name}-python34'
- 'gate-{name}-docs-{node}'
- job-group:
name: python-jobs
node:
- ubuntu-trusty
- ubuntu-xenial
node: ubuntu-xenial
jobs:
- 'gate-{name}-pep8-{node}'
- 'gate-{name}-python27-{node}'

View File

@ -3280,21 +3280,9 @@ jobs:
- name: ^gate-cliff-tox-(openstackclient|neutronclient)-tip-ubuntu-xenial$
branch: ^master$
# This job should not be run anywhere but is part of the python-jobs
# template. So, make it only run on a non-existing branch.
- name: ^gate-python-ironic-inspector-client-docs-ubuntu-trusty$
branch: ^stable/thisbranchnamewillneverexist$
- name: ^gate-python-ironic-inspector-client-docs-ubuntu-xenial$
branch: ^(?!stable/newton).*$
# NOTE(pas-ha) ironic-lib has no docs in Mitaka,
# and Trusty jobs are only run on Mitaka.
# As this job is part of python-jobs template, disable this single one
# in ironic-lib by running it only on a non-existing branch.
- name: ^gate-ironic-lib-docs-ubuntu-trusty$
branch: ^stable/thisbranchnamewillneverexist$
# NOTE(vsaienko) Ironic multinode job is voting starting from Pike
- name: ^gate-tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ubuntu-xenial$
branch: ^(?!stable/(newton|ocata)).*$
@ -11961,12 +11949,12 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/networking-ale-omniswitch
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/networking-arista