Merge "Turn on devstack exercises for neutron (non-voting)"

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml

@@ -427,6 +427,35 @@
       - email:
           recipients: openstack-stable-maint@lists.openstack.org
 
+- job-template:
+    name: 'periodic-devstack-dsvm-neutron{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 90
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_EXERCISES=1
+          export ZUUL_BRANCH={branch-override}
+          unset ZUUL_PROJECT
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs-periodic
+      - console-log-periodic
+      - email:
+          recipients: openstack-stable-maint@lists.openstack.org
+
 
 - job-group:
     name: devstack-periodic-jobs
@@ -446,3 +475,4 @@
       - 'periodic-tempest-dsvm-savanna-full{branch-designator}'
       - 'periodic-tempest-dsvm-savanna-postgres-full{branch-designator}'
       - 'periodic-tempest-dsvm-savanna-neutron{branch-designator}'
+      - 'periodic-devstack-dsvm-neutron{branch-designator}'

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -750,6 +750,36 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-devstack-dsvm-neutron{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 120
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_EXERCISES=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export 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
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-group:
     name: devstack-gate-jobs
     jobs:
@@ -783,3 +813,4 @@
       - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}'
+      - '{pipeline}-devstack-dsvm-neutron{branch-designator}'

modules/openstack_project/files/zuul/layout.yaml

@@ -119,6 +119,9 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: ^(gate|check)-tempest-dsvm-neutron-pg$
     branch: ^(?!stable/grizzly).*$
+  - name: check-devstack-dsvm-neutron
+    branch: ^(?!stable/grizzly).*$
+    voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron-isolated$
     branch: ^(?!stable/grizzly).*$
   - name: ^(gate|check)-tempest-dsvm-neutron-pg-isolated$
@@ -1179,6 +1182,7 @@ projects:
       - check-tempest-dsvm-neutron-pg-isolated
       - gate-tempest-dsvm-neutron-large-ops
       - check-grenade-dsvm-neutron
+      - check-devstack-dsvm-neutron
     gate:
       - gate-neutron-requirements
       - gate-neutron-docs
@@ -1783,6 +1787,7 @@ projects:
       - check-grenade-dsvm
       - check-grenade-dsvm-forward
       - check-swift-dsvm-functional
+      - check-devstack-dsvm-neutron
     gate:
       - gate-devstack-bash8
       - gate-tempest-dsvm-full