Merge "Fix oslo.messaging+zmq+dsvm to run from master"

jenkins/jobs/devstack-gate.yaml

@@ -2282,6 +2282,39 @@
       - console-log
 
 
+# A Template to to run a oslo.messaging devstack-plugin with oslo.messaging
+# code picked up from source
+- job-template:
+    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{branch-designator}'
+    node: 'devstack-precise || devstack-trusty'
+
+    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 PROJECTS="{plugin-repo} openstack/oslo.messaging $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-{plugin} git://git.openstack.org/{plugin-repo}"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=oslo.messaging"
+
+          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
+
+
 # A template for the misnamed drbd-devstack project.
 # Runs the full tempest suite.
 - job-template:

jenkins/jobs/projects.yaml

@@ -2182,6 +2182,11 @@
           ostype: '-f21'
           branch-designator: ''
           branch-override: default
+      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{branch-designator}':
+          pipeline: gate
+          plugin: zmq
+          plugin-repo: openstack/devstack-plugin-zmq
+          branch-designator: ''
 
 - project:
     name: oslo.middleware

zuul/layout.yaml

@@ -1452,6 +1452,10 @@ jobs:
     branch: ^(?!stable/(?:juno|kilo|liberty)).*$
     voting: false
 
+  - name: gate-oslo.messaging-src-dsvm-full-zmq
+    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    voting: false
+
   - name: gate-manila-tempest-dsvm-hdfs
     branch: ^(?!stable/juno).*$
     voting: false
@@ -4045,7 +4049,7 @@ projects:
       - gate-oslo.messaging-dsvm-functional-amqp1-f21
       - gate-oslo.messaging-python34
       - gate-oslo.messaging-dsvm-functional-zeromq
-      - gate-tempest-dsvm-full-zmq
+      - gate-oslo.messaging-src-dsvm-full-zmq
       - gate-tempest-dsvm-full-amqp1
     post:
       - oslo.messaging-coverage