opendev/system-config
Code Issues Proposed changes

Remove diablo/essex branches.

Browse Source 
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:
James E. Blair 2013-05-06 09:33:41 -07:00 committed by Jenkins
parent 104c5ef5a8
commit feb4714b0c
9 changed files with 9 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/files/gerrit/acls/openstack/horizon.config
View File

@ -4,10 +4,6 @@
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 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]
state = active
[receive]

5
modules/openstack_project/files/gerrit/acls/openstack/keystone.config
View File

@ -6,11 +6,6 @@
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 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]
state = active
[receive]

10
modules/openstack_project/files/gerrit/acls/openstack/quantum.config
View File

@ -4,16 +4,6 @@
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 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]
state = active
[receive]

76
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -183,82 +183,6 @@
- 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:
name: periodic-tempest-devstack-vm-stable-folsom
node: devstack-precise

52
modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
View File

@ -262,32 +262,6 @@
remove-prefix: 'doc/src/docbkx/openstack-compute-admin/target/docbkx/webhelp/'
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:
name: openstack-admin-manual-netconn
project-type: maven
@ -356,32 +330,6 @@
remove-prefix: 'doc/src/docbkx/openstack-object-storage-admin/target/docbkx/webhelp/'
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.
- job:
name: openstack-docs-site

8
modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
View File

@ -226,8 +226,6 @@
jobs:
- python-jobs
- python-diablo-bitrot-jobs
- python-essex-bitrot-jobs
- python-folsom-bitrot-jobs
- python-grizzly-bitrot-jobs
- openstack-publish-jobs
@ -282,8 +280,6 @@
jobs:
- python-jobs
- python-diablo-bitrot-jobs
- python-essex-bitrot-jobs
- python-folsom-bitrot-jobs
- python-grizzly-bitrot-jobs
- openstack-publish-jobs
@ -336,8 +332,6 @@
jobs:
- python-jobs
- python-diablo-bitrot-jobs
- python-essex-bitrot-jobs
- python-folsom-bitrot-jobs
- python-grizzly-bitrot-jobs
- openstack-publish-jobs
@ -388,8 +382,6 @@
jobs:
- python-jobs
- python-diablo-bitrot-jobs
- python-essex-bitrot-jobs
- python-folsom-bitrot-jobs
- python-grizzly-bitrot-jobs
- openstack-publish-jobs

24
modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
View File

@ -121,30 +121,6 @@
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:
name: python-folsom-bitrot-jobs
branch: 'stable/folsom'

23
modules/openstack_project/files/zuul/layout.yaml
View File

@ -64,35 +64,29 @@ pipelines:
jobs:
- name: ^gate-tempest-devstack-vm.*$
parameter-function: devstack_params
- name: gate-tempest-devstack-vm-cinder
branch: stable/folsom
- name: gate-tempest-devstack-vm-smoke
branch: ^(stable/(diablo|essex|folsom)).*$
branch: stable/folsom
- name: gate-tempest-devstack-vm-full
branch: ^(?!stable/(diablo|essex|folsom)).*$
branch: ^(?!stable/folsom).*$
- name: gate-tempest-devstack-vm-quantum
branch: ^(?!stable/(diablo|essex|folsom)).*$
branch: ^(?!stable/folsom).*$
- name: gate-tempest-devstack-vm-quantum-full
branch: ^(?!stable/(diablo|essex|folsom|grizzly)).*$
branch: ^(?!stable/(folsom|grizzly)).*$
voting: false
- name: gate-tempest-devstack-vm-postgres-full
branch: ^(?!stable/(diablo|essex|folsom)).*$
branch: ^(?!stable/folsom).*$
voting: false
- name: gate-grenade-devstack-vm
branch: ^(?!stable/(diablo|essex|folsom)).*$
branch: ^(?!stable/folsom).*$
voting: false
- name: ^.*-python27$
parameter-function: python27_params
- name: ^gate-.*-python26-centos6$
voting: false
branch: ^(?!stable/(diablo|essex)).*$
- name: gate-nova-pylint
voting: false
branch: ^(?!stable/(diablo|essex)).*$
- name: gate-oslo-incubator-pyflakes
branch: ^(?!stable|(diablo|essex|folsom)).*$
branch: ^(?!stable/folsom).*$
- name: dev-zuul-coverage
voting: false
- name: dev-heat-coverage
@ -115,12 +109,11 @@ jobs:
branch: ^master$
- name: gate-openstack-cli-guide
success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
branch: ^(?!stable/(diablo|essex)).*$
- name: ^gate-.*-docs$
success-pattern: http://docs-draft.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}/doc/build/html/
- name: ^gate-.*-requirements$
failure-message: Incompatible requirement found; see https://wiki.openstack.org/wiki/Requirements
branch: ^(?!stable/(diablo|essex|folsom|grizzly)).*$
branch: ^(?!stable/(folsom|grizzly)).*$
files:
- '^tools/.*-requires$'
- '^.*requirements.txt$'

9
modules/openstack_project/files/zuul/openstack_functions.py
View File

@ -1,8 +1 @@
def devstack_params(change, params):
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'
# No content currently. In repo for ease of future use.