From 49a24d0d6c861574e1baabce6c57b2ee41a70c9c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 20 Sep 2017 19:49:02 +0200 Subject: [PATCH] Branch cleanup (5/n) Remove ACLs for stable/mitaka since that branch is retired. Remove notifications for stable/mitaka from gerritbot. Remove now unused job definition. Remove liberty and mitaka in names for the proposal regex since we have no such jobs anymore. Change-Id: I45a666b2bc5c8c4e344f3fe0b582c53459742975 --- gerrit/acls/openstack/fuel-agent.config | 7 ---- gerrit/acls/openstack/fuel-astute.config | 7 ---- gerrit/acls/openstack/fuel-library.config | 7 ---- gerrit/acls/openstack/fuel-main.config | 7 ---- gerrit/acls/openstack/fuel-menu.config | 7 ---- gerrit/acls/openstack/fuel-mirror.config | 6 --- .../acls/openstack/fuel-nailgun-agent.config | 7 ---- gerrit/acls/openstack/fuel-ostf.config | 7 ---- gerrit/acls/openstack/fuel-ui.config | 7 ---- gerrit/acls/openstack/fuel-virtualbox.config | 7 ---- gerrit/acls/openstack/fuel-web.config | 7 ---- gerrit/acls/openstack/network-checker.config | 7 ---- .../acls/openstack/python-fuelclient.config | 7 ---- gerritbot/channels.yaml | 1 - jenkins/jobs/devstack-gate.yaml | 39 ------------------- zuul/openstack_functions.py | 2 +- 16 files changed, 1 insertion(+), 131 deletions(-) diff --git a/gerrit/acls/openstack/fuel-agent.config b/gerrit/acls/openstack/fuel-agent.config index 6927faae2c..89cc580d5a 100644 --- a/gerrit/acls/openstack/fuel-agent.config +++ b/gerrit/acls/openstack/fuel-agent.config @@ -20,13 +20,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-astute.config b/gerrit/acls/openstack/fuel-astute.config index c2202d7790..a5bb3c643b 100644 --- a/gerrit/acls/openstack/fuel-astute.config +++ b/gerrit/acls/openstack/fuel-astute.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-library.config b/gerrit/acls/openstack/fuel-library.config index 1327414b5d..d4372282b1 100644 --- a/gerrit/acls/openstack/fuel-library.config +++ b/gerrit/acls/openstack/fuel-library.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-main.config b/gerrit/acls/openstack/fuel-main.config index 9c71cfb98d..3e57ccd993 100644 --- a/gerrit/acls/openstack/fuel-main.config +++ b/gerrit/acls/openstack/fuel-main.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-menu.config b/gerrit/acls/openstack/fuel-menu.config index 180ce66d6e..64bb828b07 100644 --- a/gerrit/acls/openstack/fuel-menu.config +++ b/gerrit/acls/openstack/fuel-menu.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-mirror.config b/gerrit/acls/openstack/fuel-mirror.config index 2a96ec6e3e..762f891203 100644 --- a/gerrit/acls/openstack/fuel-mirror.config +++ b/gerrit/acls/openstack/fuel-mirror.config @@ -18,12 +18,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-nailgun-agent.config b/gerrit/acls/openstack/fuel-nailgun-agent.config index 2cbfe1eba5..944cf67f89 100644 --- a/gerrit/acls/openstack/fuel-nailgun-agent.config +++ b/gerrit/acls/openstack/fuel-nailgun-agent.config @@ -20,13 +20,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-ostf.config b/gerrit/acls/openstack/fuel-ostf.config index 5b3a83165e..cb48b8bb7f 100644 --- a/gerrit/acls/openstack/fuel-ostf.config +++ b/gerrit/acls/openstack/fuel-ostf.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-ui.config b/gerrit/acls/openstack/fuel-ui.config index 73b2b60853..7beb5f5eee 100644 --- a/gerrit/acls/openstack/fuel-ui.config +++ b/gerrit/acls/openstack/fuel-ui.config @@ -6,13 +6,6 @@ label-Code-Review = -2..+2 group fuel-ui-core label-Verified = -1..+1 group fuel-ci label-Workflow = -1..+1 group fuel-ui-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-virtualbox.config b/gerrit/acls/openstack/fuel-virtualbox.config index 53a74026b1..539e60c15e 100644 --- a/gerrit/acls/openstack/fuel-virtualbox.config +++ b/gerrit/acls/openstack/fuel-virtualbox.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/fuel-web.config b/gerrit/acls/openstack/fuel-web.config index bd32a23e58..b33168831a 100644 --- a/gerrit/acls/openstack/fuel-web.config +++ b/gerrit/acls/openstack/fuel-web.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/network-checker.config b/gerrit/acls/openstack/network-checker.config index 0323541121..b2bf0fa146 100644 --- a/gerrit/acls/openstack/network-checker.config +++ b/gerrit/acls/openstack/network-checker.config @@ -26,13 +26,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group fuel-release diff --git a/gerrit/acls/openstack/python-fuelclient.config b/gerrit/acls/openstack/python-fuelclient.config index dd6d5e2c22..fa740d89a2 100644 --- a/gerrit/acls/openstack/python-fuelclient.config +++ b/gerrit/acls/openstack/python-fuelclient.config @@ -27,13 +27,6 @@ label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers label-Workflow = -1..+1 group fuel-stable-core -[access "refs/heads/stable/mitaka"] -exclusiveGroupPermissions = label-Workflow -label-Code-Review = -2..+2 group fuel-stable-core -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group fuel-stable-core - [access "refs/tags/*"] pushSignedTag = group python-fuelclient-release diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 38b1e572b5..7bd379ee56 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -2172,7 +2172,6 @@ openstack-qa: - openstack/tempest-plugin-cookiecutter branches: - master - - stable/mitaka - stable/newton - stable/ocata - stable/pike diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 3745f29943..4120b64e29 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -1076,45 +1076,6 @@ - console-log -- job-template: - # Note this job runs with nova net so it only needs to run on trusty - # for mitaka. It cannot run on newton because nova net does not exist - # in ocata. For this reason we do not have a xenial version of the job. - name: '{pipeline}-grenade-dsvm-forward-{node}{suffix}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 180 - - timestamps - - builders: - - print-template-name: - template-name: "{template-name}" - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PROJECTS="openstack-dev/grenade $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_GRENADE=forward - # NOTE(mriedem): Be explicit that we need to run nova-network so that - # devstack-gate does not default to use neutron. - export DEVSTACK_GATE_NEUTRON=0 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - devstack-logs - - console-log - - - job-template: name: '{pipeline}-grenade-dsvm-neutron-{node}{suffix}' node: '{node}' diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py index 0c5d8d76a2..798a2d7510 100644 --- a/zuul/openstack_functions.py +++ b/zuul/openstack_functions.py @@ -47,7 +47,7 @@ def set_node_options(item, job, params): params['OFFLINE_NODE_WHEN_COMPLETE'] = '1' # Pass tags through for subunit2sql params['JOB_TAGS'] = ' '.join(sorted(job.tags)) - proposal_re = r'^.*(propose|upstream)-(.*?)-(constraints-.*|updates?|update-(liberty|mitaka|newton|ocata|pike)|plugins-list|openstack-constraints|update-constraints|osa-test-scripts)$' # noqa + proposal_re = r'^.*(propose|upstream)-(.*?)-(constraints-.*|updates?|update-(newton|ocata|pike)|plugins-list|openstack-constraints|update-constraints|osa-test-scripts)$' # noqa release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$' hook_re = r'^hook-(.*?)-(rtfd)$' wheel_re = r'^wheel-(build|release)-.*$'