Merge "Start using split out plugin for all keystone jobs"

jenkins/jobs/keystone.yaml

@@ -2,38 +2,6 @@
     name: '{pipeline}-keystone-dsvm-functional-{node}{suffix}'
     node: '{node}'
 
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-          export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
-
-          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}-keystone-dsvm-functional-split-plugin-{node}{suffix}'
-    node: '{node}'
-
     wrappers:
       - build-timeout:
           timeout: 70
@@ -79,6 +47,10 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -88,7 +60,6 @@
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
           export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin keystone git://git.openstack.org/openstack/keystone"
@@ -114,6 +85,10 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
       - shell: |
           #!/bin/bash -xe
           export DEVSTACK_GATE_USE_PYTHON3=True
@@ -131,7 +106,6 @@
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin keystone git://git.openstack.org/openstack/keystone"

jenkins/jobs/projects.yaml

@@ -6149,11 +6149,6 @@
           suffix: ''
           branch-override: default
           node: ubuntu-xenial
-      - '{pipeline}-keystone-dsvm-functional-split-plugin-{node}{suffix}':
-          pipeline: gate
-          suffix: '-nv'
-          branch-override: default
-          node: ubuntu-xenial
       - '{pipeline}-keystone-dsvm-functional-v3-only-{node}{suffix}':
           pipeline: gate
           suffix: '-nv'

zuul/layout.yaml

@@ -11248,7 +11248,6 @@ projects:
     check:
       - gate-keystoneclient-dsvm-functional-ubuntu-xenial-nv
       - gate-keystone-dsvm-functional-ubuntu-xenial
-      - gate-keystone-dsvm-functional-split-plugin-ubuntu-xenial-nv
       - gate-keystone-dsvm-functional-v3-only-ubuntu-xenial-nv
       - gate-keystone-dsvm-py35-functional-v3-only-ubuntu-xenial-nv
       - gate-tempest-dsvm-keystone-eventlet-full-ubuntu-trusty-nv