Remove diablo/essex branches.
Those branches are closed, so remove all special configuration: * ACLs * Bitrot jobs * Manuals jobs (which weren't actually being triggered anyway) * Zuul branch configuration * Zuul job functions. But leave the now-unused openstack_functions.py file in place so that it is easy to add in a custom Zuul parameter function in the future. Change-Id: Ib0732753543aff0b1de5880fbe8aadc4f8616835 Reviewed-on: https://review.openstack.org/28323 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins
This commit is contained in:
parent
104c5ef5a8
commit
feb4714b0c
@ -4,10 +4,6 @@
|
|||||||
[access "refs/heads/milestone-proposed"]
|
[access "refs/heads/milestone-proposed"]
|
||||||
label-Code-Review = -2..+2 group horizon-milestone
|
label-Code-Review = -2..+2 group horizon-milestone
|
||||||
label-Approved = +0..+1 group horizon-milestone
|
label-Approved = +0..+1 group horizon-milestone
|
||||||
[access "refs/heads/stable/diablo"]
|
|
||||||
label-Code-Review = -2..+2 group horizon-core
|
|
||||||
label-Code-Review = -1..+1 group Registered Users
|
|
||||||
label-Approved = +0..+1 group horizon-core
|
|
||||||
[project]
|
[project]
|
||||||
state = active
|
state = active
|
||||||
[receive]
|
[receive]
|
||||||
|
@ -6,11 +6,6 @@
|
|||||||
[access "refs/heads/milestone-proposed"]
|
[access "refs/heads/milestone-proposed"]
|
||||||
label-Code-Review = -2..+2 group keystone-milestone
|
label-Code-Review = -2..+2 group keystone-milestone
|
||||||
label-Approved = +0..+1 group keystone-milestone
|
label-Approved = +0..+1 group keystone-milestone
|
||||||
[access "refs/heads/stable/diablo"]
|
|
||||||
label-Code-Review = -2..+2 group keystone-core
|
|
||||||
label-Code-Review = -1..+1 group Registered Users
|
|
||||||
label-Approved = +0..+1 group keystone-core
|
|
||||||
exclusiveGroupPermissions = label-Approved label-Code-Review
|
|
||||||
[project]
|
[project]
|
||||||
state = active
|
state = active
|
||||||
[receive]
|
[receive]
|
||||||
|
@ -4,16 +4,6 @@
|
|||||||
[access "refs/heads/milestone-proposed"]
|
[access "refs/heads/milestone-proposed"]
|
||||||
label-Code-Review = -2..+2 group quantum-milestone
|
label-Code-Review = -2..+2 group quantum-milestone
|
||||||
label-Approved = +0..+1 group quantum-milestone
|
label-Approved = +0..+1 group quantum-milestone
|
||||||
[access "refs/heads/stable/diablo"]
|
|
||||||
exclusiveGroupPermissions = label-Code-Review label-Approved
|
|
||||||
label-Code-Review = -2..+2 group quantum-core
|
|
||||||
label-Code-Review = -1..+1 group Registered Users
|
|
||||||
label-Approved = +0..+1 group quantum-core
|
|
||||||
[access "refs/heads/stable/essex"]
|
|
||||||
exclusiveGroupPermissions = label-Code-Review label-Approved
|
|
||||||
label-Code-Review = -2..+2 group quantum-core
|
|
||||||
label-Code-Review = -1..+1 group Registered Users
|
|
||||||
label-Approved = +0..+1 group quantum-core
|
|
||||||
[project]
|
[project]
|
||||||
state = active
|
state = active
|
||||||
[receive]
|
[receive]
|
||||||
|
@ -183,82 +183,6 @@
|
|||||||
- devstack-complete
|
- devstack-complete
|
||||||
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: periodic-tempest-devstack-vm-stable-diablo
|
|
||||||
node: devstack-oneiric
|
|
||||||
|
|
||||||
wrappers:
|
|
||||||
- timeout:
|
|
||||||
timeout: 90
|
|
||||||
fail: true
|
|
||||||
- timestamps
|
|
||||||
|
|
||||||
triggers:
|
|
||||||
- timed: '0 6 * * *'
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- string:
|
|
||||||
name: ZUUL_BRANCH
|
|
||||||
description: The branch to build
|
|
||||||
default: stable/diablo
|
|
||||||
|
|
||||||
builders:
|
|
||||||
- devstack-inprogress
|
|
||||||
- devstack-checkout
|
|
||||||
- shell: |
|
|
||||||
#!/bin/bash -xe
|
|
||||||
export PYTHONUNBUFFERED=true
|
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
|
||||||
- link-logs
|
|
||||||
|
|
||||||
publishers:
|
|
||||||
- devstack-logs-periodic
|
|
||||||
- console-log-periodic
|
|
||||||
- devstack-complete
|
|
||||||
- email:
|
|
||||||
recipients: openstack-diablo-maint@lists.launchpad.net
|
|
||||||
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: periodic-tempest-devstack-vm-stable-essex
|
|
||||||
node: devstack-precise
|
|
||||||
|
|
||||||
wrappers:
|
|
||||||
- timeout:
|
|
||||||
timeout: 90
|
|
||||||
fail: true
|
|
||||||
- timestamps
|
|
||||||
|
|
||||||
triggers:
|
|
||||||
- timed: '0 6 * * *'
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
- string:
|
|
||||||
name: ZUUL_BRANCH
|
|
||||||
description: The branch to build
|
|
||||||
default: stable/essex
|
|
||||||
|
|
||||||
builders:
|
|
||||||
- devstack-inprogress
|
|
||||||
- devstack-checkout
|
|
||||||
- shell: |
|
|
||||||
#!/bin/bash -xe
|
|
||||||
export PYTHONUNBUFFERED=true
|
|
||||||
export DEVSTACK_GATE_TEMPEST=1
|
|
||||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
|
||||||
./safe-devstack-vm-gate-wrap.sh
|
|
||||||
- link-logs
|
|
||||||
|
|
||||||
publishers:
|
|
||||||
- devstack-logs-periodic
|
|
||||||
- console-log-periodic
|
|
||||||
- devstack-complete
|
|
||||||
- email:
|
|
||||||
recipients: openstack-essex-maint@lists.launchpad.net
|
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: periodic-tempest-devstack-vm-stable-folsom
|
name: periodic-tempest-devstack-vm-stable-folsom
|
||||||
node: devstack-precise
|
node: devstack-precise
|
||||||
|
@ -262,32 +262,6 @@
|
|||||||
remove-prefix: 'doc/src/docbkx/openstack-compute-admin/target/docbkx/webhelp/'
|
remove-prefix: 'doc/src/docbkx/openstack-compute-admin/target/docbkx/webhelp/'
|
||||||
excludes: '**/*.xml,**/null*'
|
excludes: '**/*.xml,**/null*'
|
||||||
|
|
||||||
- job:
|
|
||||||
name: openstack-admin-manual-keystone-diablo
|
|
||||||
project-type: maven
|
|
||||||
concurrent: false
|
|
||||||
node: quantal && !jclouds
|
|
||||||
|
|
||||||
triggers:
|
|
||||||
- zuul-post
|
|
||||||
|
|
||||||
maven:
|
|
||||||
maven-name: Maven3
|
|
||||||
root-module:
|
|
||||||
group-id: org.openstack.docs
|
|
||||||
artifact-id: openstack-guide
|
|
||||||
root-pom: doc/src/docbkx/openstack-identity-service-starter/pom.xml
|
|
||||||
goals: 'clean generate-sources'
|
|
||||||
|
|
||||||
publishers:
|
|
||||||
- console-log-post
|
|
||||||
- ftp:
|
|
||||||
site: docs.openstack.org
|
|
||||||
source: 'doc/src/docbkx/openstack-identity-service-starter/target/docbkx/webhelp/trunk/**'
|
|
||||||
target: 'diablo'
|
|
||||||
remove-prefix: 'doc/src/docbkx/openstack-identity-service-starter/target/docbkx/webhelp/trunk/'
|
|
||||||
excludes: '**/*.xml,**/null*'
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-admin-manual-netconn
|
name: openstack-admin-manual-netconn
|
||||||
project-type: maven
|
project-type: maven
|
||||||
@ -356,32 +330,6 @@
|
|||||||
remove-prefix: 'doc/src/docbkx/openstack-object-storage-admin/target/docbkx/webhelp/'
|
remove-prefix: 'doc/src/docbkx/openstack-object-storage-admin/target/docbkx/webhelp/'
|
||||||
excludes: '**/*.xml,**/null*'
|
excludes: '**/*.xml,**/null*'
|
||||||
|
|
||||||
- job:
|
|
||||||
name: openstack-admin-manuals-diablo
|
|
||||||
project-type: maven
|
|
||||||
concurrent: false
|
|
||||||
node: quantal && !jclouds
|
|
||||||
|
|
||||||
triggers:
|
|
||||||
- zuul-post
|
|
||||||
|
|
||||||
maven:
|
|
||||||
maven-name: Maven3
|
|
||||||
root-module:
|
|
||||||
group-id: org.openstack.docs
|
|
||||||
artifact-id: openstack-guide
|
|
||||||
root-pom: doc/pom.xml
|
|
||||||
goals: 'clean generate-sources'
|
|
||||||
|
|
||||||
publishers:
|
|
||||||
- console-log-post
|
|
||||||
- ftp:
|
|
||||||
site: docs.openstack.org
|
|
||||||
source: 'doc/target/docbkx/webhelp/trunk/**'
|
|
||||||
target: 'diablo'
|
|
||||||
remove-prefix: 'doc/target/docbkx/webhelp/trunk/'
|
|
||||||
excludes: '**/*.xml,**/null*'
|
|
||||||
|
|
||||||
# in zuul/layout.yaml specified to only run against master branch.
|
# in zuul/layout.yaml specified to only run against master branch.
|
||||||
- job:
|
- job:
|
||||||
name: openstack-docs-site
|
name: openstack-docs-site
|
||||||
|
@ -226,8 +226,6 @@
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- python-jobs
|
- python-jobs
|
||||||
- python-diablo-bitrot-jobs
|
|
||||||
- python-essex-bitrot-jobs
|
|
||||||
- python-folsom-bitrot-jobs
|
- python-folsom-bitrot-jobs
|
||||||
- python-grizzly-bitrot-jobs
|
- python-grizzly-bitrot-jobs
|
||||||
- openstack-publish-jobs
|
- openstack-publish-jobs
|
||||||
@ -282,8 +280,6 @@
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- python-jobs
|
- python-jobs
|
||||||
- python-diablo-bitrot-jobs
|
|
||||||
- python-essex-bitrot-jobs
|
|
||||||
- python-folsom-bitrot-jobs
|
- python-folsom-bitrot-jobs
|
||||||
- python-grizzly-bitrot-jobs
|
- python-grizzly-bitrot-jobs
|
||||||
- openstack-publish-jobs
|
- openstack-publish-jobs
|
||||||
@ -336,8 +332,6 @@
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- python-jobs
|
- python-jobs
|
||||||
- python-diablo-bitrot-jobs
|
|
||||||
- python-essex-bitrot-jobs
|
|
||||||
- python-folsom-bitrot-jobs
|
- python-folsom-bitrot-jobs
|
||||||
- python-grizzly-bitrot-jobs
|
- python-grizzly-bitrot-jobs
|
||||||
- openstack-publish-jobs
|
- openstack-publish-jobs
|
||||||
@ -388,8 +382,6 @@
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- python-jobs
|
- python-jobs
|
||||||
- python-diablo-bitrot-jobs
|
|
||||||
- python-essex-bitrot-jobs
|
|
||||||
- python-folsom-bitrot-jobs
|
- python-folsom-bitrot-jobs
|
||||||
- python-grizzly-bitrot-jobs
|
- python-grizzly-bitrot-jobs
|
||||||
- openstack-publish-jobs
|
- openstack-publish-jobs
|
||||||
|
@ -121,30 +121,6 @@
|
|||||||
node: '{node}'
|
node: '{node}'
|
||||||
|
|
||||||
|
|
||||||
- job-group:
|
|
||||||
name: python-diablo-bitrot-jobs
|
|
||||||
branch: 'stable/diablo'
|
|
||||||
branch-name: 'stable-diablo'
|
|
||||||
email: openstack-diablo-maint@lists.launchpad.net
|
|
||||||
node: oneiric
|
|
||||||
jobs:
|
|
||||||
- 'periodic-{name}-python26-{branch-name}'
|
|
||||||
- 'periodic-{name}-python27-{branch-name}'
|
|
||||||
- 'periodic-{name}-docs-{branch-name}'
|
|
||||||
|
|
||||||
|
|
||||||
- job-group:
|
|
||||||
name: python-essex-bitrot-jobs
|
|
||||||
branch: 'stable/essex'
|
|
||||||
branch-name: 'stable-essex'
|
|
||||||
email: openstack-essex-maint@lists.launchpad.net
|
|
||||||
node: quantal
|
|
||||||
jobs:
|
|
||||||
- 'periodic-{name}-python26-{branch-name}'
|
|
||||||
- 'periodic-{name}-python27-{branch-name}'
|
|
||||||
- 'periodic-{name}-docs-{branch-name}'
|
|
||||||
|
|
||||||
|
|
||||||
- job-group:
|
- job-group:
|
||||||
name: python-folsom-bitrot-jobs
|
name: python-folsom-bitrot-jobs
|
||||||
branch: 'stable/folsom'
|
branch: 'stable/folsom'
|
||||||
|
@ -64,35 +64,29 @@ pipelines:
|
|||||||
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- name: ^gate-tempest-devstack-vm.*$
|
|
||||||
parameter-function: devstack_params
|
|
||||||
- name: gate-tempest-devstack-vm-cinder
|
- name: gate-tempest-devstack-vm-cinder
|
||||||
branch: stable/folsom
|
branch: stable/folsom
|
||||||
- name: gate-tempest-devstack-vm-smoke
|
- name: gate-tempest-devstack-vm-smoke
|
||||||
branch: ^(stable/(diablo|essex|folsom)).*$
|
branch: stable/folsom
|
||||||
- name: gate-tempest-devstack-vm-full
|
- name: gate-tempest-devstack-vm-full
|
||||||
branch: ^(?!stable/(diablo|essex|folsom)).*$
|
branch: ^(?!stable/folsom).*$
|
||||||
- name: gate-tempest-devstack-vm-quantum
|
- name: gate-tempest-devstack-vm-quantum
|
||||||
branch: ^(?!stable/(diablo|essex|folsom)).*$
|
branch: ^(?!stable/folsom).*$
|
||||||
- name: gate-tempest-devstack-vm-quantum-full
|
- name: gate-tempest-devstack-vm-quantum-full
|
||||||
branch: ^(?!stable/(diablo|essex|folsom|grizzly)).*$
|
branch: ^(?!stable/(folsom|grizzly)).*$
|
||||||
voting: false
|
voting: false
|
||||||
- name: gate-tempest-devstack-vm-postgres-full
|
- name: gate-tempest-devstack-vm-postgres-full
|
||||||
branch: ^(?!stable/(diablo|essex|folsom)).*$
|
branch: ^(?!stable/folsom).*$
|
||||||
voting: false
|
voting: false
|
||||||
- name: gate-grenade-devstack-vm
|
- name: gate-grenade-devstack-vm
|
||||||
branch: ^(?!stable/(diablo|essex|folsom)).*$
|
branch: ^(?!stable/folsom).*$
|
||||||
voting: false
|
voting: false
|
||||||
- name: ^.*-python27$
|
|
||||||
parameter-function: python27_params
|
|
||||||
- name: ^gate-.*-python26-centos6$
|
- name: ^gate-.*-python26-centos6$
|
||||||
voting: false
|
voting: false
|
||||||
branch: ^(?!stable/(diablo|essex)).*$
|
|
||||||
- name: gate-nova-pylint
|
- name: gate-nova-pylint
|
||||||
voting: false
|
voting: false
|
||||||
branch: ^(?!stable/(diablo|essex)).*$
|
|
||||||
- name: gate-oslo-incubator-pyflakes
|
- name: gate-oslo-incubator-pyflakes
|
||||||
branch: ^(?!stable|(diablo|essex|folsom)).*$
|
branch: ^(?!stable/folsom).*$
|
||||||
- name: dev-zuul-coverage
|
- name: dev-zuul-coverage
|
||||||
voting: false
|
voting: false
|
||||||
- name: dev-heat-coverage
|
- name: dev-heat-coverage
|
||||||
@ -115,12 +109,11 @@ jobs:
|
|||||||
branch: ^master$
|
branch: ^master$
|
||||||
- name: gate-openstack-cli-guide
|
- name: gate-openstack-cli-guide
|
||||||
success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
|
success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
|
||||||
branch: ^(?!stable/(diablo|essex)).*$
|
|
||||||
- name: ^gate-.*-docs$
|
- name: ^gate-.*-docs$
|
||||||
success-pattern: http://docs-draft.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}/doc/build/html/
|
success-pattern: http://docs-draft.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}/doc/build/html/
|
||||||
- name: ^gate-.*-requirements$
|
- name: ^gate-.*-requirements$
|
||||||
failure-message: Incompatible requirement found; see https://wiki.openstack.org/wiki/Requirements
|
failure-message: Incompatible requirement found; see https://wiki.openstack.org/wiki/Requirements
|
||||||
branch: ^(?!stable/(diablo|essex|folsom|grizzly)).*$
|
branch: ^(?!stable/(folsom|grizzly)).*$
|
||||||
files:
|
files:
|
||||||
- '^tools/.*-requires$'
|
- '^tools/.*-requires$'
|
||||||
- '^.*requirements.txt$'
|
- '^.*requirements.txt$'
|
||||||
|
@ -1,8 +1 @@
|
|||||||
def devstack_params(change, params):
|
# No content currently. In repo for ease of future use.
|
||||||
if change.branch == 'stable/diablo':
|
|
||||||
params['NODE_LABEL'] = 'devstack-oneiric'
|
|
||||||
|
|
||||||
def python27_params(change, params):
|
|
||||||
if (hasattr(change, 'branch') and
|
|
||||||
change.branch == 'stable/diablo'):
|
|
||||||
params['NODE_LABEL'] = 'oneiric'
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user