From 1b3fa59dcce083bac5e5b6af2323ff48d5082b13 Mon Sep 17 00:00:00 2001
From: Armando Migliaccio <armamig@gmail.com>
Date: Thu, 25 Feb 2016 21:25:37 -0800
Subject: [PATCH] Make tweaks to neutron-plus job

This change moves the job definition closer to the other
job definitions available in the neutron.yaml file.

It also replaces the suffix with 'scenarios', which is more
intuitive than 'plus', and better reflects the nature of testing
that this job is going to carry out.

Finally, it adds a post hook, and tune some configuration knobs
to allow for finer control of its execution.

Change-Id: I24be6ddc14a40950bb9ffc2c91e6150a6a74d266
---
 jenkins/jobs/devstack-gate.yaml | 41 +---------------------------
 jenkins/jobs/neutron.yaml       | 48 ++++++++++++++++++++++++++++++++-
 zuul/layout.yaml                |  4 +--
 3 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 9ef9602043..7d4a7e153a 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -425,45 +425,6 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-plus{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export DEVSTACK_GATE_NEUTRON=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function gate_hook {{
-              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-plus
-          }}
-          export -f gate_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
-
-
 - job-template:
     name: '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
     node: '{node}'
@@ -2840,7 +2801,7 @@
       - '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron-ovs-native{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
-      - '{pipeline}-tempest-dsvm-neutron-plus{job-suffix}'
+      - '{pipeline}-tempest-dsvm-neutron-scenarios{job-suffix}'
       - '{pipeline}-tempest-dsvm-neutron{job-suffix}'
       - '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
       - '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index fd2565c958..db245dae46 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -477,4 +477,50 @@
 
     publishers:
       - devstack-logs
-      - console-log
\ No newline at end of file
+      - console-log
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-scenarios{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
+          export DEVSTACK_GATE_EXERCISES=0
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_INSTALL_TESTONLY=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function gate_hook {{
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenarios
+          }}
+          export -f gate_hook
+
+          function post_test_hook {{
+              bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenarios
+          }}
+          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:
+      - test-results
+      - devstack-logs
+      - console-log
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 909fe52ad5..6f217bfd51 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2295,7 +2295,7 @@ jobs:
   - name: gate-tempest-dsvm-neutron-full-ssh
     voting: false
 
-  - name: gate-tempest-dsvm-neutron-plus
+  - name: gate-tempest-dsvm-neutron-scenarios
     branch: ^(?!stable/(?:kilo|liberty)).*$
 
   - name: ^gate-.*-releasenotes$
@@ -7018,7 +7018,7 @@ projects:
       - neutron-coverage
     experimental:
       - gate-neutron-dsvm-functional-py34
-      - gate-tempest-dsvm-neutron-plus
+      - gate-tempest-dsvm-neutron-scenarios
       - gate-grenade-dsvm-neutron-forward
       - gate-neutron-vpnaas-dsvm-functional
       - gate-neutron-vpnaas-dsvm-functional-sswan