Merge "Enable non-apache devstack job for Mistral"

jenkins/jobs/mistral.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-{component}-devstack-dsvm-{node}{suffix}'
+    name: '{pipeline}-{component}-devstack-dsvm{special}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -28,6 +28,14 @@
           export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
 
+          if [ "{special}" == "-non-apache" ]; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"MISTRAL_USE_MOD_WSGI=False"
+          fi
+
+          if [ "{special}" == "-kombu" ]; then
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"MISTRAL_RPC_IMPLEMENTATION=kombu"
+          fi
+
           function post_test_hook {{
               cd /opt/stack/new/{component}/functionaltests
               ./post_test_hook.sh
@@ -41,6 +49,7 @@
       - devstack-logs
       - console-log
 
+
 - job:
     name: gate-mistral-docker-buildimage
     node: ubuntu-xenial
@@ -62,44 +71,3 @@
               keep-hierarchy: false
               copy-after-failure: false
       - console-log
-
-
-- job-template:
-    name: 'gate-mistral-devstack-dsvm-kombu{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_NEUTRON=1
-
-          export ENABLED_SERVICES=heat,h-api,h-api-cfn,h-api-cw,h-eng,tempest
-          export PROJECTS="openstack/heat $PROJECTS"
-          export PROJECTS="openstack/mistral $PROJECTS"
-          export PROJECTS="openstack/mistral-dashboard $PROJECTS"
-          export PROJECTS="openstack/python-mistralclient $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MISTRAL_RPC_IMPLEMENTATION=kombu"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
-
-          function post_test_hook {{
-              cd /opt/stack/new/mistral/functionaltests
-              ./post_test_hook.sh
-          }}
-          export -f post_test_hook
-
-          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

@@ -6932,13 +6932,24 @@
       # other projects.
       # - openstack-server-release-jobs
       - pypi-jobs
-      - '{pipeline}-{component}-devstack-dsvm-{node}{suffix}':
+      - '{pipeline}-{component}-devstack-dsvm{special}-{node}{suffix}':
           pipeline: gate
-          node:
-            - ubuntu-trusty
-            - ubuntu-xenial
+          node: ubuntu-xenial
           component: mistral
           suffix: '-nv'
+          special: ''
+      - '{pipeline}-{component}-devstack-dsvm{special}-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          component: mistral
+          suffix: '-nv'
+          special: '-non-apache'
+      - '{pipeline}-{component}-devstack-dsvm{special}-{node}{suffix}':
+          pipeline: gate
+          node: ubuntu-xenial
+          component: mistral
+          suffix: '-nv'
+          special: '-kombu'
       - gate-rally-dsvm-mistral-{name}-{node}{suffix}:
           name: task
           node:
@@ -6952,9 +6963,6 @@
           node:
             - ubuntu-trusty
             - ubuntu-xenial
-      - 'gate-mistral-devstack-dsvm-kombu{suffix}':
-          suffix: '-nv'
-          node: ubuntu-xenial
 
 - project:
     name: mistral-dashboard
@@ -12872,13 +12880,14 @@
       - python-jobs
       - pypi-jobs
       - openstack-client-publish-jobs
-      - '{pipeline}-{component}-devstack-dsvm-{node}{suffix}':
+      - '{pipeline}-{component}-devstack-dsvm{special}-{node}{suffix}':
           pipeline: gate
           node:
             - ubuntu-trusty
             - ubuntu-xenial
           suffix: ''
           component: python-mistralclient
+          special: ''
 
 - project:
     name: python-moganclient

zuul/layout.yaml

@@ -3020,7 +3020,7 @@ jobs:
   - name: gate-mistral-python34
     branch: ^stable/mitaka$
 
-  - name: gate-mistral-devstack-dsvm-kombu-nv
+  - name: gate-mistral-devstack-dsvm-kombu-ubuntu-xenial-nv
     branch: ^(?!stable/(?:mitaka|newton)).*$
 
   - name: gate-mistral-dashboard-python34
@@ -3032,6 +3032,10 @@ jobs:
   - name: ^gate-mistral-tox-unit-postgresql-ubuntu-(trusty|xenial)$
     voting: false
 
+  # NOTE(bcrochet) (mistral) run non-apache pike and forward
+  - name: ^gate-mistral-devstack-dsvm-non-apache-ubuntu-xenial-nv
+    branch: ^(?!stable/(mitaka|newton|ocata)).*$
+
   - name: gate-mistral-docker-buildimage
     branch: master
 
@@ -11781,13 +11785,13 @@ projects:
       - mistral-coverage-ubuntu-xenial-nv
       - gate-rally-dsvm-mistral-task-ubuntu-trusty-nv
       - gate-rally-dsvm-mistral-task-ubuntu-xenial-nv
-      - gate-mistral-devstack-dsvm-ubuntu-trusty-nv
       - gate-mistral-devstack-dsvm-ubuntu-xenial-nv
+      - gate-mistral-devstack-dsvm-non-apache-ubuntu-xenial-nv
       - gate-mistral-tox-unit-mysql-ubuntu-xenial
       - gate-mistral-tox-unit-postgresql-ubuntu-trusty
       - gate-mistral-tox-unit-postgresql-ubuntu-xenial
       - gate-tripleo-ci-centos-7-scenario003-multinode-oooq-puppet
-      - gate-mistral-devstack-dsvm-kombu-nv
+      - gate-mistral-devstack-dsvm-kombu-ubuntu-xenial-nv
     gate:
       - gate-tripleo-ci-centos-7-scenario003-multinode-oooq-puppet
     post: