Merge "RM unused jobs: neutron-vpnaas, oslo.messaging, neutron, networking-odl"

jenkins/jobs/devstack-gate.yaml

@@ -893,46 +893,6 @@
       - devstack-logs
       - console-log
 
-
-- job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 180
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - local_conf:
-          conf: |
-            [[local|localrc]]
-            ENABLE_IDENTITY_V2=False
-            SERVICE_DOMAIN_NAME=service
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_TLSPROXY=1
-          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}-tempest-dsvm-oslo-latest-full{suffix}'
     node: '{node}'
@@ -2449,7 +2409,6 @@
       - '{pipeline}-tempest-dsvm-full-test-accounts-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-oslo-latest-full{suffix}'
 
 # Jobs will get defined for stable branches in the periodic pipeline, and

jenkins/jobs/projects.yaml

@@ -7656,15 +7656,6 @@
       - openstack-releasenotes-jobs
       - pypi-jobs
       # tempest-dsvm-networking-odl-{odl-release-base} is for newton+
-      - '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
-          pipeline: gate
-          node: ubuntu-xenial
-          suffix: '-nv'
-          odl-provider: ''
-          driver-version: 'v2driver'
-          odl-release-base:
-            - 'carbon-snapshot'
-          branch-override: default
       - '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
@@ -8308,9 +8299,7 @@
       - '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}-{node}{suffix}':
           pipeline: gate
           node: ubuntu-xenial
-          vpnaastest:
-            - functional
-            - functional-sswan
+          vpnaastest: functional-sswan
           suffix: ''
           branch-override: default
       - '{pipeline}-neutron-vpnaas-dsvm-rally-{node}{suffix}':
@@ -9765,9 +9754,7 @@
           config: default
           node: ubuntu-xenial
           plugin-repo: openstack/devstack-plugin-zmq
-          suffix:
-            - ''
-            - '-nv'
+          suffix: '-nv'
       - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}-{config}-{node}{suffix}':
           pipeline: gate
           plugin: amqp1
@@ -9931,7 +9918,6 @@
       - translation-jobs
       - openstack-releasenotes-jobs
       - 'lib-forward-testing-{name}'
-      - 'stable-compat-jobs-{name}'
       - '{pipeline}-{name}-src-grenade-dsvm-multinode-{node-release}{suffix}':
           pipeline: gate
           node-release: ubuntu-xenial

jenkins/jobs/tempest-jobs.yaml

@@ -7,21 +7,6 @@
           suffix: ''
           branch-override: default
 
-- job-group:
-    name: 'stable-compat-jobs-{name}'
-    jobs:
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{suffix}':
-          pipeline: gate
-          node: ubuntu-xenial
-          suffix: '-newton'
-          branch-override: stable/newton
-      - '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{suffix}':
-          pipeline: gate
-          node: ubuntu-xenial
-          suffix: '-ocata'
-          branch-override: stable/ocata
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-cinder-v1-{node}{suffix}'
     node: '{node}'

zuul/layout.yaml

@@ -461,11 +461,6 @@ project-templates:
     gate:
       - 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-xenial'
 
-  - name: stable-compat-jobs
-    check:
-      - 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-xenial-newton'
-      - 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-xenial-ocata'
-
   - name: snap-jobs
     check:
       - 'gate-{name}-tox-with-sudo-snap'
@@ -2377,11 +2372,6 @@ jobs:
   - name: ^.*gerrit.*buck$
     branch: ^openstack/(?!2\.4).*$
 
-    # For stable compat jobs.
-  - name: ^gate-tempest-dsvm-neutron-src-.*-newton$
-    branch: ^(?!stable/newton).*$
-    voting: false
-
   - name: ^gate-python-cinderclient-pylint.*$
     voting: false