Remove grizzly jobs and job filters

Any grizzly-specific jobs and filters which prevent jobs from being
run on stable/grizzly branches are removed, but this should not be
merged until all stable/grizzly proposed changes have been abandoned
and corresponding branches tagged and deleted.

Change-Id: I39f93f67b96961cd9991b6a13fecddb16e3a20fa
This commit is contained in:
Jeremy Stanley 2014-03-26 22:15:31 +00:00
parent 28ef76a179
commit e296d375a6
7 changed files with 6 additions and 253 deletions

View File

@ -5,11 +5,6 @@
[access "refs/heads/milestone-proposed"] [access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 group ceilometer-milestone label-Code-Review = -2..+2 group ceilometer-milestone
label-Approved = +0..+1 group ceilometer-milestone label-Approved = +0..+1 group ceilometer-milestone
[access "refs/heads/stable/grizzly"]
exclusiveGroupPermissions = label-Code-Review label-Approved
label-Code-Review = -2..+2 group ceilometer-core
label-Code-Review = -1..+1 group Registered Users
label-Approved = +0..+1 group ceilometer-core
[project] [project]
state = active state = active
[receive] [receive]

View File

@ -96,81 +96,6 @@
target: '/{lang}/' target: '/{lang}/'
remove-prefix: 'publish-docs/{lang}/' remove-prefix: 'publish-docs/{lang}/'
- job-template:
name: openstack-{oldmanual}-old
project-type: maven
node: bare-precise
prebuilders:
- revoke-sudo
- gerrit-git-prep
properties:
- inject:
script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
properties-file: gerrit-doc.properties
maven:
maven-name: Maven3
root-module:
group-id: org.openstack.docs
artifact-id: openstack-guide
root-pom: doc/src/docbkx/openstack-{oldmanual}/pom.xml
goals: '-Drelease.path.name=${{DOC_RELEASE_PATH}} -Dcomments.enabled=${{DOC_COMMENTS_ENABLED}} clean generate-sources -B'
publishers:
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/**'
target: '/'
remove-prefix: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/'
excludes: '**/*.xml,**/null*'
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/**/atom.xml'
target: '/'
remove-prefix: 'doc/src/docbkx/openstack-{oldmanual}/target/docbkx/webhelp/'
- job-template:
name: openstack-{install}-{distribution}-old
project-type: maven
node: bare-precise
prebuilders:
- revoke-sudo
- gerrit-git-prep
properties:
- inject:
script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
properties-file: gerrit-doc.properties
prebuilders:
- gerrit-git-prep
maven:
maven-name: Maven3
root-module:
group-id: org.openstack.docs
artifact-id: openstack-guide
root-pom: doc/src/docbkx/{install}/pom.xml
goals: '-Doperating.system={system} -Dprofile.os={profileos} -Drelease.path.name=${{DOC_RELEASE_PATH}} -Dcomments.enabled=${{DOC_COMMENTS_ENABLED}} clean generate-sources -B'
publishers:
- console-log
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/{install}/target/docbkx/webhelp/**'
target: ''
remove-prefix: 'doc/src/docbkx/{install}/target/docbkx/webhelp/'
excludes: '**/*.xml,**/null*'
- ftp:
site: docs.openstack.org
source: 'doc/src/docbkx/{install}/target/docbkx/webhelp/**/atom.xml'
target: ''
remove-prefix: 'doc/src/docbkx/{install}/target/docbkx/webhelp/'
- job-template: - job-template:
name: 'gate-{name}-tox-doc-publish-{envlist}' name: 'gate-{name}-tox-doc-publish-{envlist}'

View File

@ -1,16 +1,3 @@
# in zuul/layout.yaml specified to only run against stable/grizzly
- job:
name: gate-openstack-manuals-validate
node: bare-precise
builders:
- revoke-sudo
- gerrit-git-prep
- shell: "./tools/validate.py"
publishers:
- console-log
# 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

View File

@ -1,7 +1,3 @@
- job:
name: gate-grenade-noop
node: bare-precise
- job: - job:
name: node-test name: node-test

View File

@ -322,7 +322,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- translation-jobs - translation-jobs
@ -336,7 +335,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- gate-{name}-pylint - gate-{name}-pylint
@ -544,7 +542,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- translation-jobs - translation-jobs
@ -559,7 +556,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- translation-jobs - translation-jobs
@ -610,7 +606,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
@ -674,7 +669,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- translation-jobs - translation-jobs
@ -733,7 +727,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- gate-{name}-pylint - gate-{name}-pylint
@ -1004,7 +997,6 @@
jobs: jobs:
- python-jobs - python-jobs
- python-grizzly-bitrot-jobs
- python-havana-bitrot-jobs - python-havana-bitrot-jobs
- openstack-publish-jobs - openstack-publish-jobs
- translation-jobs - translation-jobs
@ -1292,22 +1284,12 @@
branch-designator: '' branch-designator: ''
branch-override: default branch-override: default
# Stable check jobs for testing devstack gate # Stable check jobs for testing devstack gate
- devstack-jobs:
pipeline: check
node: 'devstack-precise || devstack-precise-check'
branch-designator: '-grizzly'
branch-override: stable/grizzly
- devstack-jobs: - devstack-jobs:
pipeline: check pipeline: check
node: 'devstack-precise || devstack-precise-check' node: 'devstack-precise || devstack-precise-check'
branch-designator: '-havana' branch-designator: '-havana'
branch-override: stable/havana branch-override: stable/havana
# Periodic jobs for various branches # Periodic jobs for various branches
- devstack-jobs:
pipeline: periodic
node: devstack-precise
branch-designator: '-grizzly'
branch-override: stable/grizzly
- devstack-jobs: - devstack-jobs:
pipeline: periodic pipeline: periodic
node: devstack-precise node: devstack-precise
@ -2112,34 +2094,6 @@
- openstack-operations-guide-{lang} - openstack-operations-guide-{lang}
# in zuul/layout.yaml specified to only run against
# stable/grizzly
- 'openstack-{oldmanual}-old'
- openstack-{install}-{distribution}-old:
install: basic-install
distribution: fedora
system: yum
profileos: "centos;fedora;rhel"
- openstack-{install}-{distribution}-old:
install: basic-install
distribution: ubuntu
system: apt
profileos: "ubuntu;debian"
- openstack-{install}-{distribution}-old:
install: openstack-install
distribution: fedora
system: yum
profileos: "centos;fedora;rhel"
- openstack-{install}-{distribution}-old:
install: openstack-install
distribution: ubuntu
system: apt
profileos: "ubuntu"
- project: - project:
name: operations-guide name: operations-guide
github-org: openstack github-org: openstack

View File

@ -83,17 +83,6 @@
node: '{node}' node: '{node}'
- job-group:
name: python-grizzly-bitrot-jobs
branch: 'stable/grizzly'
branch-name: '-grizzly'
node: bare-precise
jobs:
- 'periodic-{name}-python26{branch-name}'
- 'periodic-{name}-python27{branch-name}'
- 'periodic-{name}-docs{branch-name}'
- job-group: - job-group:
name: python-havana-bitrot-jobs name: python-havana-bitrot-jobs
branch: 'stable/havana' branch: 'stable/havana'

View File

@ -307,40 +307,29 @@ jobs:
- name: ^(periodic|post)-mirror-python(26|27|33)$ - name: ^(periodic|post)-mirror-python(26|27|33)$
parameter-function: reusable_node parameter-function: reusable_node
# the salt-trigger worker has no jobs yet # the salt-trigger worker has no jobs yet
- name: ^(gate|check)-requirements-integration-dsvm$
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-neutron-pg$
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-neutron-full$ - name: ^(gate|check)-tempest-dsvm-neutron-full$
branch: ^(?!stable/grizzly).*$
voting: false voting: false
- name: ^(gate|check)-tempest-dsvm-neutron-heat-slow - name: ^(gate|check)-tempest-dsvm-neutron-heat-slow
branch: ^(?!stable/(grizzly|havana)).*$ branch: ^(?!stable/havana).*$
- name: check-tempest-dsvm-ironic-nv - name: check-tempest-dsvm-ironic-nv
voting: false voting: false
- name: check-tempest-dsvm-ironic-postgres-nv - name: check-tempest-dsvm-ironic-postgres-nv
voting: false voting: false
- name: ^check-tempest-dsvm-virtual-ironic.*$ - name: ^check-tempest-dsvm-virtual-ironic.*$
voting: false voting: false
- name: ^(gate|check)-tempest-dsvm-large-ops$
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-neutron-large-ops$
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-cells$ - name: ^(gate|check)-tempest-dsvm-cells$
voting: false voting: false
- name: ^(gate|check)-tempest-dsvm-cells-full$ - name: ^(gate|check)-tempest-dsvm-cells-full$
voting: false voting: false
- name: ^(gate|check)-grenade-dsvm$ - name: ^(gate|check)-grenade-dsvm$
branch: ^(?!stable/(grizzly|havana)).*$ branch: ^(?!stable/havana).*$
- name: ^(gate|check)-grenade-dsvm-neutron$ - name: ^(gate|check)-grenade-dsvm-neutron$
branch: ^(?!stable/(grizzly|havana)).*$ branch: ^(?!stable/havana).*$
voting: false voting: false
- name: ^(gate|check)-grenade-dsvm-partial-ncpu$ - name: ^(gate|check)-grenade-dsvm-partial-ncpu$
branch: ^(?!stable/(grizzly|havana)).*$ branch: ^(?!stable/havana).*$
- name: ^gate-.*-pypy$ - name: ^gate-.*-pypy$
voting: false voting: false
- name: gate-tempest-python27
branch: ^(?!stable/grizzly).*$
# only here until stable is votable, then merge # only here until stable is votable, then merge
# back to a single job # back to a single job
- name: ^(gate|check)-grenade-dsvm-forward$ - name: ^(gate|check)-grenade-dsvm-forward$
@ -349,28 +338,6 @@ jobs:
- name: ^(gate|check)-grenade-dsvm-neutron-forward - name: ^(gate|check)-grenade-dsvm-neutron-forward
branch: ^(stable/).*$ branch: ^(stable/).*$
voting: false voting: false
- name: gate-grenade-noop
branch: ^(stable/grizzly).*$
- name: gate-devstack-bash8
branch: ^(?!stable/grizzly).*$
- name: gate-tempest-docs
branch: ^(?!stable/grizzly).*$
- name: tempest-docs
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-swift-dsvm-functional$
branch: ^(?!stable/grizzly).*$
- name: check-tempest-dsvm-full-grizzly
voting: false
- name: check-tempest-dsvm-neutron-grizzly
voting: false
- name: check-tempest-dsvm-postgres-full-grizzly
voting: false
- name: check-devstack-dsvm-cells-grizzly
voting: false
- name: check-tempest-dsvm-cells-grizzly
voting: false
- name: check-tempest-dsvm-cells-full-grizzly
voting: false
- name: check-tempest-dsvm-full-havana - name: check-tempest-dsvm-full-havana
voting: false voting: false
- name: check-tempest-dsvm-neutron-havana - name: check-tempest-dsvm-neutron-havana
@ -396,10 +363,7 @@ jobs:
- name: gate-nova-pylint - name: gate-nova-pylint
voting: false voting: false
- name: gate-cinder-pylint - name: gate-cinder-pylint
branch: ^(?!stable/grizzly).*$
voting: false voting: false
- name: gate-horizon-python27-django14
branch: ^(?!stable/grizzly).*$
- name: dev-zuul-coverage - name: dev-zuul-coverage
voting: false voting: false
- name: jenkins-job-builder-compare-xml - name: jenkins-job-builder-compare-xml
@ -437,51 +401,12 @@ jobs:
branch: master branch: master
- name: ^.*manuals-upstream-translation-update$ - name: ^.*manuals-upstream-translation-update$
branch: master branch: master
# Documentation targets for master and future stable branches:
- name: openstack-config-reference
branch: ^(?!stable/grizzly).*$
- name: openstack-install-deploy-guide-debian
branch: ^(?!stable/grizzly).*$
- name: openstack-install-deploy-guide-fedora
branch: ^(?!stable/grizzly).*$
- name: openstack-install-deploy-guide-opensuse
branch: ^(?!stable/grizzly).*$
- name: openstack-install-deploy-guide-ubuntu
branch: ^(?!stable/grizzly).*$
- name: gate-openstack-manuals-tox-checkniceness - name: gate-openstack-manuals-tox-checkniceness
branch: ^(?!stable/grizzly).*$
voting: false voting: false
- name: gate-openstack-manuals-tox-checksyntax
branch: ^(?!stable/grizzly).*$
- name: gate-openstack-manuals-tox-checkdeletions
branch: ^(?!stable/grizzly).*$
# The order of the next two rules is important, the more generic one
# needs to be first.
- name: ^gate-.*-tox-doc-publish-checkbuild$ - name: ^gate-.*-tox-doc-publish-checkbuild$
success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/publish-docs/ success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/publish-docs/
- name: gate-openstack-manuals-tox-doc-publish-checkbuild
branch: ^(?!stable/grizzly).*$
- name: ^gate-.*-tox-checkniceness$ - name: ^gate-.*-tox-checkniceness$
voting: false voting: false
# Deprecated documentation targets:
- name: openstack-block-storage-admin-old
branch: stable/grizzly
- name: openstack-compute-admin-old
branch: stable/grizzly
- name: openstack-network-connectivity-admin-old
branch: stable/grizzly
- name: openstack-object-storage-admin-old
branch: stable/grizzly
- name: openstack-basic-install-fedora-old
branch: stable/grizzly
- name: openstack-basic-install-ubuntu-old
branch: stable/grizzly
- name: openstack-openstack-install-fedora-old
branch: stable/grizzly
- name: openstack-openstack-install-ubuntu-old
branch: stable/grizzly
- name: gate-openstack-manuals-validate
branch: stable/grizzly
- name: ^gate-.*-docs$ - name: ^gate-.*-docs$
success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/ success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/
- name: gate-storyboard-webclient-js-unittests - name: gate-storyboard-webclient-js-unittests
@ -490,14 +415,10 @@ jobs:
branch: ^(?!master).*$ branch: ^(?!master).*$
- 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/(grizzly|havana)).*$ branch: ^(?!stable/havana).*$
files: files:
- '^tools/.*-requires$' - '^tools/.*-requires$'
- '^.*requirements.txt$' - '^.*requirements.txt$'
- name: ^gate-requirements-pep8$
branch: ^(?!stable/grizzly).*$
- name: ^gate-requirements-(python27|pypy)$
branch: ^(?!stable/grizzly).*$
- name: gate-hacking-python33 - name: gate-hacking-python33
voting: false voting: false
- name: gate-hacking-pypy - name: gate-hacking-pypy
@ -599,7 +520,7 @@ jobs:
- name: gate-storyboard-python33 - name: gate-storyboard-python33
voting: false voting: false
- name: gate-oslo-incubator-python33 - name: gate-oslo-incubator-python33
branch: ^(?!stable/(grizzly|havana)).*$ branch: ^(?!stable/havana).*$
- name: gate-nova-docker-python26 - name: gate-nova-docker-python26
voting: false voting: false
- name: gate-nova-docker-python27 - name: gate-nova-docker-python27
@ -2371,18 +2292,8 @@ projects:
template: template:
- name: openstack-doc-gate - name: openstack-doc-gate
- name: openstack-doc-translation - name: openstack-doc-translation
check:
- gate-openstack-manuals-validate
gate:
- gate-openstack-manuals-validate
post: post:
- openstack-admin-guide-cloud - openstack-admin-guide-cloud
- openstack-block-storage-admin-old
- openstack-compute-admin-old
- openstack-network-connectivity-admin-old
- openstack-object-storage-admin-old
- openstack-basic-install-fedora-old
- openstack-basic-install-ubuntu-old
- openstack-glossary - openstack-glossary
- openstack-image-guide - openstack-image-guide
- openstack-cli-reference - openstack-cli-reference
@ -2391,10 +2302,8 @@ projects:
- openstack-ha-guide - openstack-ha-guide
- openstack-install-deploy-guide-debian - openstack-install-deploy-guide-debian
- openstack-install-deploy-guide-fedora - openstack-install-deploy-guide-fedora
- openstack-openstack-install-fedora-old
- openstack-install-deploy-guide-opensuse - openstack-install-deploy-guide-opensuse
- openstack-install-deploy-guide-ubuntu - openstack-install-deploy-guide-ubuntu
- openstack-openstack-install-ubuntu-old
- openstack-install-deploy-guide-ja - openstack-install-deploy-guide-ja
- openstack-security-guide - openstack-security-guide
- openstack-user-guide - openstack-user-guide
@ -2452,13 +2361,11 @@ projects:
- name: openstack-dev/grenade - name: openstack-dev/grenade
check: check:
- gate-grenade-noop
- check-grenade-dsvm - check-grenade-dsvm
- check-grenade-dsvm-forward - check-grenade-dsvm-forward
- check-grenade-dsvm-neutron - check-grenade-dsvm-neutron
- check-grenade-dsvm-partial-ncpu - check-grenade-dsvm-partial-ncpu
gate: gate:
- gate-grenade-noop
- gate-grenade-dsvm - gate-grenade-dsvm
- gate-grenade-dsvm-forward - gate-grenade-dsvm-forward
- gate-grenade-dsvm-neutron - gate-grenade-dsvm-neutron