From baa5e292dc790a4395b8f6422e53a65dc3b5c33a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 27 Sep 2016 16:22:57 +0200
Subject: [PATCH] Move periodic-python-jobs-with-neutron-lib-master to xenial

Use xenial as node - and py35 as environment - for these jobs that run
on master. We have switched the py34 job already to py35 with xenial.

Update grafana for the change.

Update tox environment to use a variable.

Change-Id: Iadc4e03a4176a83e97c3b166c6043516ac57bcd8
---
 grafana/networking-ovn.yaml                        | 2 +-
 grafana/neutron.yaml                               | 2 +-
 jenkins/jobs/neutron.yaml                          | 2 +-
 jenkins/jobs/python-jobs.yaml                      | 2 +-
 jenkins/scripts/run-tox-with-neutron-lib-master.sh | 4 ++--
 zuul/layout.yaml                                   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/grafana/networking-ovn.yaml b/grafana/networking-ovn.yaml
index 7daf0423ff..223c12dd45 100644
--- a/grafana/networking-ovn.yaml
+++ b/grafana/networking-ovn.yaml
@@ -36,7 +36,7 @@ dashboard:
         - title: Periodic Job Failure Rates
           span: 4
           targets:
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-networking-ovn-py34-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-networking-ovn-py34-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-ovn-py34-with-neutron-lib-master')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-networking-ovn-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-networking-ovn-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-ovn-py35-with-neutron-lib-master')
           type: graph
     - title: Graphs
       height: 320px
diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml
index db9af84d56..afae30368a 100644
--- a/grafana/neutron.yaml
+++ b/grafana/neutron.yaml
@@ -38,7 +38,7 @@ dashboard:
           targets:
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py27-with-oslo-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py27-with-oslo-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-neutron-py27-with-oslo-master')
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py34-with-oslo-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py34-with-oslo-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-neutron-py34-with-oslo-master')
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py34-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py34-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-neutron-py34-with-neutron-lib-master')
+            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-neutron-py35-with-neutron-lib-master')
           type: graph
     - title: Graphs
       height: 320px
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index e7056c0b7b..2fd106f2e7 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: 'periodic-{name}-{python}-with-neutron-lib-master'
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     wrappers:
       - build-timeout:
diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
index ef9f6bfa2b..3d5c9e5da9 100644
--- a/jenkins/jobs/python-jobs.yaml
+++ b/jenkins/jobs/python-jobs.yaml
@@ -621,7 +621,7 @@
     jobs:
       - 'periodic-{name}-{python}-with-neutron-lib-master':
           python:
-            - py34
+            - py35
 
 - job-group:
     name: python-jobs
diff --git a/jenkins/scripts/run-tox-with-neutron-lib-master.sh b/jenkins/scripts/run-tox-with-neutron-lib-master.sh
index b8ad986371..ee3210e0ed 100755
--- a/jenkins/scripts/run-tox-with-neutron-lib-master.sh
+++ b/jenkins/scripts/run-tox-with-neutron-lib-master.sh
@@ -7,7 +7,7 @@ venv=$1
 if [[ -z "$venv" ]]; then
     echo "Usage: $?"
     echo
-    echo "VENV: The tox environment to run (eg 'py34')"
+    echo "VENV: The tox environment to run (eg 'py35')"
     exit 1
 fi
 
@@ -18,7 +18,7 @@ sed -i "s/neutron-lib.*/-e git+https:\/\/git.openstack.org\/openstack\/neutron-l
 
 cat << EOF >> tox.ini
 
-[testenv:py34-neutron-lib-master]
+[testenv:${venv}-neutron-lib-master]
 setenv = VIRTUAL_ENV={envdir}
 passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 usedevelop = True
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e4c83ff9ae..9ff5b574af 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -452,7 +452,7 @@ project-templates:
 
   - name: periodic-jobs-with-neutron-lib-master
     periodic:
-      - 'periodic-{name}-py34-with-neutron-lib-master'
+      - 'periodic-{name}-py35-with-neutron-lib-master'
 
   # This is the same template as python-jobs but uses the new
   # linters target instead of pep8.