Merge "Enable py35 job for monasca-transform"

jenkins/jobs/monasca-transform.yaml

@@ -1,5 +1,5 @@
-- job:
-    name: gate-tempest-dsvm-monasca-transform-python-functional
+- job-template:
+    name: 'gate-tempest-dsvm-monasca-transform-{pyver}-functional{suffix}'
 
     node: ubuntu-xenial
 
@@ -20,6 +20,13 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
+
+          if [ "{pyver}" == "python35" ]; then
+              export DEVSTACK_GATE_USE_PYTHON3=True
+          else
+              export DEVSTACK_GATE_USE_PYTHON3=False
+          fi
+
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/monasca-transform $PROJECTS"
           export PROJECTS="openstack/monasca-api $PROJECTS"
@@ -33,15 +40,15 @@
           export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS"
           export PROJECTS="openstack/monasca-ui $PROJECTS"
 
-          function pre_test_hook {
+          function pre_test_hook {{
               source $BASE/new/monasca-transform/devstack/pre_test_hook.sh
-          }
+          }}
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               # Configure and run tempest on monasca-transform installation
               source $BASE/new/monasca-transform/devstack/post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@@ -49,4 +56,4 @@
 
     publishers:
       - devstack-logs
-      - console-log
+      - console-log

jenkins/jobs/projects.yaml

@@ -7096,11 +7096,15 @@
 
 - project:
     name: monasca-transform
-
     jobs:
       - python-jobs
       - pypi-jobs
-      - 'gate-{name}-python35-nv'
+      - 'gate-tempest-dsvm-monasca-transform-{pyver}-functional{suffix}':
+          pyver: 'python'
+          suffix: ''
+      - 'gate-tempest-dsvm-monasca-transform-{pyver}-functional{suffix}':
+          pyver: 'python35'
+          suffix: '-nv'
 
 - project:
     name: monasca-ui

zuul/layout.yaml

@@ -1143,6 +1143,10 @@ jobs:
   - name: ^gate-tempest-dsvm-monasca-transform-python-functional$
     branch: ^(?!stable/newton).*$
 
+  # enable python35 test for master and stable/pike onwards
+  - name: ^gate-tempest-dsvm-monasca-transform-python35-functional
+    branch: ^(?!stable/(newton|ocata)).*$
+
   # OpenStack documentation process is not meant to be part of stable/ocata
   - name: ^gate-monasca-log-api-releasenotes$
     branch: ^(?!stable/(newton|ocata)).*$
@@ -11667,12 +11671,13 @@ projects:
   - name: openstack/monasca-transform
     template:
       - name: merge-check
-      - name: check-requirements
-      - name: publish-to-pypi
       - name: python-jobs
-      - name: python35-jobs-nv
+      - name: python35-jobs
+      - name: publish-to-pypi
+      - name: check-requirements
     check:
       - gate-tempest-dsvm-monasca-transform-python-functional
+      - gate-tempest-dsvm-monasca-transform-python35-functional-nv
     gate:
       - gate-tempest-dsvm-monasca-transform-python-functional