Merge "Branch cleanup (3/n)"

This commit is contained in:
Jenkins 2017-09-20 17:01:54 +00:00 committed by Gerrit Code Review
commit 7cdae92cec
2 changed files with 6 additions and 82 deletions

View File

@ -751,7 +751,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: ceilometermiddleware
@ -1404,7 +1403,6 @@
- openstack-publish-jobs
- openstack-releasenotes-jobs
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -1417,7 +1415,6 @@
name: cloudpulse
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -1432,7 +1429,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- '{pipeline}-dsvm-collectd-ceilometer-plugin-{install_type}-{node}{suffix}':
pipeline: gate
node:
@ -2811,9 +2807,7 @@
jobs:
- gate-{name}-docs-{node}:
node:
- ubuntu-trusty
- ubuntu-xenial
node: ubuntu-xenial
- project:
name: fuel-library
@ -4092,9 +4086,7 @@
jobs:
- hook-{name}-rtfd
- 'gate-{name}-docs-{node}':
node:
- ubuntu-xenial
- ubuntu-trusty
node: ubuntu-xenial
- 'gate-{name}-releasenotes'
- project:
@ -5583,14 +5575,12 @@
jobs:
- pypi-jobs
- python-jobs
- python-jobs-trusty
- project:
name: networking-6wind
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-ale-omniswitch
@ -5696,7 +5686,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-calico
@ -5720,9 +5709,6 @@
jobs:
- python-jobs
- 'gate-{name}-tox-{envlist}-{node}':
envlist: newton
node: ubuntu-trusty
- 'gate-{name}-tox-{envlist}-{node}':
envlist:
- newton
@ -5830,7 +5816,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -5975,14 +5960,12 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-nec
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: networking-odl
@ -6145,7 +6128,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- '{pipeline}-tempest-dsvm-networking-ovs-dpdk{suffix}':
pipeline: gate
node: ubuntu-xenial
@ -6164,7 +6146,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -6235,7 +6216,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: neutron
@ -6823,7 +6803,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: novajoin
@ -10648,14 +10627,12 @@
jobs:
- coverage-jobs
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
name: python-cloudpulseclient
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -11618,9 +11595,7 @@
- babel
- py27-check-uc
- py35-check-uc
node:
- ubuntu-trusty
- ubuntu-xenial
node: ubuntu-xenial
- project:
name: requirements-jobs
@ -12035,7 +12010,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- project:
name: shovel
@ -12343,11 +12317,8 @@
- openstack-server-release-jobs
- openstack-publish-jobs
- python-jobs
- python-jobs-trusty
- gate-storlets-functional-{node}:
node:
- ubuntu-trusty
- ubuntu-xenial
node: ubuntu-xenial
- project:
name: storyboard
@ -12724,7 +12695,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -13565,7 +13535,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- project:
@ -13970,7 +13939,6 @@
jobs:
- python-jobs
- python-jobs-trusty
- pypi-jobs
- hook-{name}-rtfd

View File

@ -2177,13 +2177,13 @@ jobs:
# but passing on master, thus do not run it on newton.
# Note networking-arista still has mitaka-hpi branch.
- name: ^gate-(requirements|murano-agent|networking-arista)-python35
branch: ^(?!stable/(mitaka|newton)).*$
branch: ^(?!stable/newton).*$
# This overrides the above "looser" match above, while we work through the
# py34 -> py35 transition. Also note that this job will not work from
# Ocata onwards as devstack drops support for trusty
- name: gate-requirements-integration-dsvm-ubuntu-trusty
branch: ^stable/(mitaka|newton)$
branch: ^stable/newton$
- name: ^gate-requirements-tox-validate-projects-ubuntu-xenial$
branch: master
@ -6147,7 +6147,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/ceilometermiddleware
template:
@ -6770,7 +6769,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: python35-jobs
- name: openstack-unified-publish-jobs
- name: publish-to-pypi
@ -6785,7 +6783,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/cloudroast
@ -6803,7 +6800,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
experimental:
- gate-dsvm-collectd-ceilometer-plugin-src-ubuntu-xenial-nv
- gate-dsvm-collectd-ceilometer-plugin-bin-ubuntu-xenial-nv
@ -9467,10 +9463,8 @@ projects:
template:
- name: merge-check
check:
- gate-fuel-docs-docs-ubuntu-trusty
- gate-fuel-docs-docs-ubuntu-xenial
gate:
- gate-fuel-docs-docs-ubuntu-trusty
- gate-fuel-docs-docs-ubuntu-xenial
- name: openstack/fuel-library
@ -10972,11 +10966,9 @@ projects:
- name: merge-check
- name: docs-on-rtfd
check:
- gate-k8s-docker-suite-app-murano-docs-ubuntu-trusty
- gate-k8s-docker-suite-app-murano-docs-ubuntu-xenial
- gate-k8s-docker-suite-app-murano-releasenotes
gate:
- gate-k8s-docker-suite-app-murano-docs-ubuntu-trusty
- gate-k8s-docker-suite-app-murano-docs-ubuntu-xenial
- gate-k8s-docker-suite-app-murano-releasenotes
@ -12188,13 +12180,9 @@ projects:
- name: merge-check
- name: publish-to-pypi
check:
- gate-network-checker-pep8-ubuntu-trusty
- gate-network-checker-python27-ubuntu-trusty
- gate-network-checker-pep8-ubuntu-xenial
- gate-network-checker-python27-ubuntu-xenial
gate:
- gate-network-checker-pep8-ubuntu-trusty
- gate-network-checker-python27-ubuntu-trusty
- gate-network-checker-pep8-ubuntu-xenial
- gate-network-checker-python27-ubuntu-xenial
@ -12202,7 +12190,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/networking-ale-omniswitch
template:
@ -12287,14 +12274,12 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/networking-brocade
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/networking-calico
template:
@ -12320,13 +12305,11 @@ projects:
check:
- gate-networking-cisco-compare-coverage-ubuntu-xenial-nv
- gate-networking-cisco-tox-newton-ubuntu-xenial
- gate-networking-cisco-tox-newton-ubuntu-trusty
- gate-networking-cisco-tox-ocata-ubuntu-xenial
- gate-networking-cisco-tox-pike-ubuntu-xenial
- gate-networking-cisco-tox-master-ubuntu-xenial
gate:
- gate-networking-cisco-tox-newton-ubuntu-xenial
- gate-networking-cisco-tox-newton-ubuntu-trusty
- gate-networking-cisco-tox-ocata-ubuntu-xenial
- name: openstack/networking-cumulus
@ -12432,7 +12415,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/networking-l2gw
@ -12506,13 +12488,11 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/networking-nec
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: python35-jobs
- name: openstack/networking-odl
@ -12607,7 +12587,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
experimental:
- gate-tempest-dsvm-networking-ovs-dpdk-nv
@ -12621,7 +12600,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/networking-powervm
@ -12677,7 +12655,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/neutron
template:
@ -13093,7 +13070,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: openstack/novajoin
template:
@ -15939,7 +15915,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: python35-jobs
- name: publish-to-pypi
- name: osc-plugin-jobs
@ -15950,7 +15925,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/python-cognitiveclient
@ -16924,8 +16898,6 @@ projects:
- name: python35-jobs
- name: publish-to-pypi
check:
- gate-requirements-pep8-ubuntu-trusty
- gate-requirements-python27-ubuntu-trusty
- gate-requirements-python34
- gate-requirements-docs-ubuntu-xenial
- gate-requirements-pep8-ubuntu-xenial
@ -16933,10 +16905,8 @@ projects:
- gate-requirements-integration-dsvm-ubuntu-trusty
- gate-requirements-integration-dsvm-ubuntu-xenial
- gate-requirements-tox-babel-ubuntu-xenial
- gate-requirements-tox-py27-check-uc-ubuntu-trusty
- gate-requirements-tox-py27-check-uc-ubuntu-xenial
- gate-requirements-tox-py35-check-uc-ubuntu-xenial
- gate-requirements-tox-validate-ubuntu-trusty
- gate-requirements-tox-validate-ubuntu-xenial
- gate-requirements-tox-validate-projects-ubuntu-xenial
- gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
@ -16957,8 +16927,6 @@ projects:
- gate-cross-swift-python27-ubuntu-xenial
- gate-cross-swift-python35
gate:
- gate-requirements-pep8-ubuntu-trusty
- gate-requirements-python27-ubuntu-trusty
- gate-requirements-python34
- gate-requirements-docs-ubuntu-xenial
- gate-requirements-pep8-ubuntu-xenial
@ -16966,10 +16934,8 @@ projects:
- gate-requirements-integration-dsvm-ubuntu-trusty
- gate-requirements-integration-dsvm-ubuntu-xenial
- gate-requirements-tox-babel-ubuntu-xenial
- gate-requirements-tox-py27-check-uc-ubuntu-trusty
- gate-requirements-tox-py27-check-uc-ubuntu-xenial
- gate-requirements-tox-py35-check-uc-ubuntu-xenial
- gate-requirements-tox-validate-ubuntu-trusty
- gate-requirements-tox-validate-ubuntu-xenial
- gate-requirements-tox-validate-projects-ubuntu-xenial
- gate-grenade-dsvm-neutron-multinode-ubuntu-xenial
@ -17304,13 +17270,9 @@ projects:
template:
- name: merge-check
check:
- gate-shotgun-pep8-ubuntu-trusty
- gate-shotgun-python27-ubuntu-trusty
- gate-shotgun-pep8-ubuntu-xenial
- gate-shotgun-python27-ubuntu-xenial
gate:
- gate-shotgun-pep8-ubuntu-trusty
- gate-shotgun-python27-ubuntu-trusty
- gate-shotgun-pep8-ubuntu-xenial
- gate-shotgun-python27-ubuntu-xenial
@ -17652,15 +17614,12 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: python35-jobs
- name: openstack-unified-publish-jobs
- name: openstack-server-release-jobs
check:
- gate-storlets-functional-ubuntu-trusty
- gate-storlets-functional-ubuntu-xenial
gate:
- gate-storlets-functional-ubuntu-trusty
- gate-storlets-functional-ubuntu-xenial
- name: openstack/surveil
@ -18078,7 +18037,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/tooz
@ -18492,7 +18450,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: publish-to-pypi
- name: openstack/turbo-hipster
@ -18905,7 +18862,6 @@ projects:
template:
- name: merge-check
- name: python-jobs
- name: python-jobs-trusty
- name: python35-jobs
- name: publish-to-pypi
- name: docs-on-rtfd