Python 3.5 jobs are standard

With upcoming cross-project goals to make testing against Python 3
mandatory for all Python-based deliverables of official projects, it
makes sense to start including the voting gate-{name}-python35
template directly in the python-jobs job-group. While at it, make
sure Python 3.4 jobs only run on branches prior to stable/newton now
that the Trusty to Xenial switch is complete.

Change-Id: I4466a9702f6d5fd5e07121d3899e5692fbe7de34

jenkins/jobs/charm-jobs.yaml

@@ -17,6 +17,7 @@
       - 'gate-{name}-pep8-{node}'
       - 'gate-{name}-python27-{node}'
       - 'gate-{name}-python34'
+      - 'gate-{name}-python35'
       - '{name}-branch-tarball'
 
 - job-group:

jenkins/jobs/python-jobs.yaml

@@ -338,7 +338,7 @@
     node: ubuntu-trusty
 
 - job-template:
-    name: 'gate-{name}-python35{suffix}'
+    name: 'gate-{name}-python35-nv'
 
     wrappers:
       - build-timeout:
@@ -362,8 +362,62 @@
     node: ubuntu-xenial
 
 - job-template:
-    name: 'gate-{name}-python35-db{suffix}'
-    description: 'Same job as gate-{name}-python35{suffix} but sets up databases.'
+    name: 'gate-{name}-python35'
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - zuul-git-prep-upper-constraints
+      - install-distro-packages
+      - extra-test-setup
+      - revoke-sudo
+      - python35
+      - assert-no-extra-files
+
+    publishers:
+      - test-results
+      - console-log
+
+    node: ubuntu-xenial
+
+- job-template:
+    name: 'gate-{name}-python35-db-nv'
+    description: 'Same job as gate-{name}-python35-nv but sets up databases.'
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - zuul-git-prep-upper-constraints
+      - install-distro-packages
+      - mysql-prep
+      - pgsql-prep
+      - mysql-db:
+          db_name: openstack_citest
+      - pgsql-db:
+          db_name: openstack_citest
+      - revoke-sudo
+      - python35
+      - assert-no-extra-files
+
+    publishers:
+      - test-results
+      - console-log
+
+    node: ubuntu-xenial
+
+- job-template:
+    name: 'gate-{name}-python35-db'
+    description: 'Same job as gate-{name}-python35 but sets up databases.'
 
     wrappers:
       - build-timeout:
@@ -724,6 +778,7 @@
       - 'gate-{name}-pep8-{node}'
       - 'gate-{name}-python27-{node}'
       - 'gate-{name}-python34'
+      - 'gate-{name}-python35'
       - 'gate-{name}-docs-{node}'
       - 'gate-{name}-requirements'
       - '{name}-branch-tarball'
@@ -752,6 +807,7 @@
       - 'gate-{name}-pep8-{node}'
       - 'gate-{name}-python27-db-{node}'
       - 'gate-{name}-python34-db'
+      - 'gate-{name}-python35-db'
       - 'gate-{name}-docs-{node}'
       - 'gate-{name}-requirements'
       - '{name}-branch-tarball'

zuul/layout.yaml

@@ -1203,6 +1203,9 @@ jobs:
   # to run ubuntu-trusty jobs against master.
   - name: ^.*-ubuntu-trusty-(liberty|mitaka)(-nv)?$
     branch: master
+  # Restrict python34 testing to <= Mitaka.
+  - name: ^gate-.*-python34(-db)?(-nv)?$
+    branch: ^stable/(liberty|mitaka)$
   # Restrict python35 testing to >= Newton.
   - name: ^gate-.*-python35(-db)?(-nv)?$
     branch: ^(?!stable/(liberty|mitaka)).*$