Merge "Drop unstable configuration for tempest-dsvm-neutron job"

jenkins/jobs/neutron.yaml

@@ -274,39 +274,3 @@
     publishers:
       - devstack-logs
       - console-log
-
-- job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-unstable{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_NEUTRON_UNSTABLE=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # For feature/qos branch, actually enable qos service plugin
-          if [[ "$BRANCH_OVERRIDE" =~ ^feature/qos$ ]] || [[ "$ZUUL_BRANCH" =~ ^feature/qos$ ]] ; then
-              export DEVSTACK_LOCAL_CONFIG="Q_SERVICE_PLUGIN_CLASSES=qos"
-          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

jenkins/jobs/projects.yaml

@@ -809,11 +809,6 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-neutron-unstable{branch-designator}':
-          pipeline: gate
-          node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
-          branch-override: default
       - '{pipeline}-tempest-dsvm-neutron{branch-designator}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'

zuul/layout.yaml

@@ -1206,10 +1206,6 @@ jobs:
   - name: gate-tempest-dsvm-neutron-linuxbridge
     voting: false
 
-  - name: gate-tempest-dsvm-neutron-unstable
-    branch: ^(?!stable/(juno|kilo)).*$
-    voting: false
-
   - name: gate-trove-buildimage-mysql
     voting: false
 
@@ -2366,7 +2362,6 @@ projects:
       - gate-neutron-lbaasv1-dsvm-api
       - gate-neutron-lbaasv2-dsvm-api
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-tempest-dsvm-neutron-unstable
       - gate-tempest-dsvm-neutron-multinode-smoke
     gate:
       - gate-neutron-dsvm-api