Merge "Branch cleanup (5/n)"

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

gerritbot/channels.yaml

@@ -2172,7 +2172,6 @@ openstack-qa:
     - openstack/tempest-plugin-cookiecutter
   branches:
     - master
-    - stable/mitaka
     - stable/newton
     - stable/ocata
     - stable/pike

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}'

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)-.*$'