Use py36 instead of py35 for periodic master jobs

OpenStack Train will test on py36 instead of py35, change the periodic
master jobs periodic-jobs-with-X-master to use py36.

Leave openstack-tox-py35-with-neutron-lib-master and -with-ovsdbapp
in for now, we first need to change a few users.

Change-Id: Ie2941e89e543db406db5a89666dfcb576e3e8f96

zuul.d/jobs.yaml

@@ -738,21 +738,21 @@
       bindep_profile: test py27
 
 - job:
-    name: openstack-tox-py35-with-oslo-master
+    name: openstack-tox-py36-with-oslo-master
     parent: openstack-tox-with-oslo-master-base
-    nodeset: ubuntu-xenial
+    nodeset: ubuntu-bionic
     description: |
       This job installs all oslo libraries from source and tests that the
       unit tests of the tested project work.
 
-      It uses the tox ``py35`` environment.
+      It uses the tox ``py36`` environment.
 
       The job is normally run in a periodic pipeline, it is configured
       to run on the master branch.
     branches: master
     vars:
-      tox_envlist: py35
-      bindep_profile: test py35
+      tox_envlist: py36
+      bindep_profile: test py36
 
 - job:
     name: openstack-tox-py35-with-neutron-lib-master
@@ -766,6 +766,29 @@
 
       The job is normally run in a periodic pipeline, it is configured
       to run on the master branch.
+
+      This job is obsolete, use
+      :zuul:job:`openstack-tox-py36-with-neutron-lib-master` instead.
+
+    branches: master
+    required-projects:
+      - openstack/neutron
+      - openstack/neutron-lib
+    vars:
+      tox_install_siblings: true
+
+- job:
+    name: openstack-tox-py36-with-neutron-lib-master
+    parent: openstack-tox-py36
+    timeout: 3000
+    description: |
+      This job installs neutron-lib from source and tests that the
+      unit tests of the tested project work.
+
+      It uses the tox ``py36`` environment.
+
+      The job is normally run in a periodic pipeline, it is configured
+      to run on the master branch.
     branches: master
     required-projects:
       - openstack/neutron
@@ -785,6 +808,28 @@
 
       The job is normally run in a periodic pipeline, it is configured
       to run on the master branch.
+
+      This job is obsolete, use
+      :zuul:job:`openstack-tox-py36-with-ovsdbapp-master` instead.
+
+    branches: master
+    required-projects:
+      - openstack/ovsdbapp
+    vars:
+      tox_install_siblings: true
+
+- job:
+    name: openstack-tox-py36-with-ovsdbapp-master
+    parent: openstack-tox-py36
+    timeout: 3000
+    description: |
+      This job installs ovsdbapp from source and tests that the
+      unit tests of the tested project work.
+
+      It uses the tox ``py36`` environment.
+
+      The job is normally run in a periodic pipeline, it is configured
+      to run on the master branch.
     branches: master
     required-projects:
       - openstack/ovsdbapp

zuul.d/project-templates.yaml

@@ -1231,7 +1231,7 @@
       neutron-lib from source.
     periodic:
       jobs:
-        - openstack-tox-py35-with-neutron-lib-master
+        - openstack-tox-py36-with-neutron-lib-master
 
 - project-template:
     name: periodic-jobs-with-oslo-master
@@ -1241,7 +1241,7 @@
     periodic:
       jobs:
         - openstack-tox-py27-with-oslo-master
-        - openstack-tox-py35-with-oslo-master
+        - openstack-tox-py36-with-oslo-master
 
 - project-template:
     name: periodic-jobs-with-ovsdbapp-master
@@ -1250,7 +1250,7 @@
       ovdsdbapp from source.
     periodic:
       jobs:
-        - openstack-tox-py35-with-ovsdbapp-master
+        - openstack-tox-py36-with-ovsdbapp-master
 
 - project-template:
     name: python-charm-interface-jobs