Merge "Add a gate-dsvm-functional-py34 job to Neutron"

jenkins/jobs/neutron.yaml

@@ -83,7 +83,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-neutron-dsvm-functional{branch-designator}'
+    name: '{pipeline}-neutron-dsvm-functional{python}{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -125,7 +125,7 @@
 
           function post_test_hook {{
               if [[ -e $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh ]]; then
-                 bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
+                 bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional{python}
               else
                  # Before kilo
                  bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/post_test_hook.sh

jenkins/jobs/projects.yaml

@@ -2818,13 +2818,21 @@
       - gate-rally-dsvm-neutron-{name}
       - translation-jobs
       - translation-jobs-liberty
-      - '{pipeline}-neutron-dsvm-functional{branch-designator}':
+      - '{pipeline}-neutron-dsvm-functional{python}{branch-designator}':
           pipeline: gate
+          python: ''
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-neutron-dsvm-functional{branch-designator}':
+      - '{pipeline}-neutron-dsvm-functional{python}{branch-designator}':
           pipeline: gate
+          python: '-py34'
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-neutron-dsvm-functional{python}{branch-designator}':
+          pipeline: gate
+          python: ''
           node: 'devstack-precise || devstack-trusty'
           branch-designator: '-nv'
           branch-override: default

zuul/layout.yaml

@@ -743,7 +743,7 @@ jobs:
   # Skip non-doc jobs for doc-only neutron changes.  Since
   # doc/source/conf.py is checked by neutron-(pep8|pylint), those jobs
   # should not be skipped.
-  - name: ^.*neutron-(dsvm-api|dsvm-functional|python(27|34)|lbaasv[1,2]-dsvm-(api|minimal)|dsvm-fullstack)(-constraints)?$
+  - name: ^.*neutron-(dsvm-api|dsvm-functional|dsvm-functional-py34|python(27|34)|lbaasv[1,2]-dsvm-(api|minimal)|dsvm-fullstack)(-constraints)?$
     skip-if:
       - project: ^openstack/neutron$
         all-files-match-any:
@@ -885,6 +885,10 @@ jobs:
   - name: gate-networking-cisco-requirements
     voting: false
 
+  - name: gate-neutron-dsvm-functional-py34
+    branch: ^(?!stable/(juno|kilo|liberty)).*$
+    voting: false
+
     # Images for Icehouse do not contain python34
   - name: ^gate-.*-python34$
     branch: ^(?!stable/icehouse).*$
@@ -6057,6 +6061,7 @@ projects:
     check:
       - gate-neutron-dsvm-api
       - gate-neutron-dsvm-functional
+      - gate-neutron-dsvm-functional-py34
       - gate-neutron-dsvm-fullstack
       - gate-rally-dsvm-neutron-neutron
       - gate-tempest-dsvm-neutron-dvr