Merge "Drop neutron-pg in favor of a voting neutron-pg-full"

jenkins/jobs/devstack-gate.yaml

@@ -446,40 +446,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-pg{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_POSTGRES=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_CONFIGDRIVE=0
-          export DEVSTACK_GATE_SMOKE_SERIAL=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-neutron-dvr{branch-designator}'
     node: '{node}'
@@ -2026,7 +1992,6 @@
       - '{pipeline}-tempest-master-dsvm-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron{branch-designator}'
       - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}'
-      - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'

zuul/layout.yaml

@@ -280,13 +280,12 @@ project-templates:
   - name: integrated-gate-neutron
     check:
       - 'check-tempest-dsvm-neutron'
-      - 'check-tempest-dsvm-neutron-pg'
       - 'check-tempest-dsvm-neutron-full'
       - 'check-tempest-dsvm-neutron-pg-full'
       - 'check-grenade-dsvm-neutron'
     gate:
       - 'gate-tempest-dsvm-neutron'
-      - 'gate-tempest-dsvm-neutron-pg'
+      - 'gate-tempest-dsvm-neutron-pg-full'
       - 'gate-tempest-dsvm-neutron-full'
 
   - name: lib-forward-testing
@@ -624,7 +623,6 @@ jobs:
     branch: ^(?!stable/icehouse).*$
   - name: ^(gate|check)-tempest-dsvm-neutron-pg-full$
     branch: ^(?!stable/icehouse).*$
-    voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron$
     branch: ^(stable/icehouse).*$
   - name: check-heat-dsvm-functional-mysql
@@ -1745,7 +1743,6 @@ projects:
       - nova-coverage
     experimental:
       - gate-grenade-dsvm-forward
-      - check-tempest-dsvm-neutron-pg
       - gate-nova-pip-missing-reqs
       - check-tempest-dsvm-neutron-multinode-full
       - experimental-nova-dsvm-python27