diff --git a/grafana/neutron.yaml b/grafana/neutron.yaml index afae30368a..8fc643f723 100644 --- a/grafana/neutron.yaml +++ b/grafana/neutron.yaml @@ -37,7 +37,7 @@ dashboard: span: 4 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-py35-with-oslo-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-neutron-py35-with-oslo-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-neutron-py35-with-oslo-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 diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index 3d5c9e5da9..ac987229e3 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -212,7 +212,7 @@ - job-template: name: 'periodic-{name}-{python}-with-oslo-master' - node: ubuntu-trusty + node: ubuntu-xenial wrappers: - build-timeout: @@ -614,7 +614,7 @@ - 'periodic-{name}-{python}-with-oslo-master': python: - py27 - - py34 + - py35 - job-group: name: periodic-python-jobs-with-neutron-lib-master diff --git a/jenkins/scripts/run-tox-with-oslo-master.sh b/jenkins/scripts/run-tox-with-oslo-master.sh index f1ff4e3f0c..a105b92be4 100755 --- a/jenkins/scripts/run-tox-with-oslo-master.sh +++ b/jenkins/scripts/run-tox-with-oslo-master.sh @@ -88,20 +88,20 @@ commands = {[testenv]commands} EOF -if grep "^\[testenv:py34\]" tox.ini +if grep "^\[testenv:py35\]" tox.ini then cat << EOF >> tox.ini -[testenv:py34-oslo-master] +[testenv:py35-oslo-master] posargs = commands = bash oslo-from-master.sh - {[testenv:py34]commands} + {[testenv:py35]commands} EOF else cat << EOF >> tox.ini -[testenv:py34-oslo-master] +[testenv:py35-oslo-master] posargs = commands = bash oslo-from-master.sh diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9ff5b574af..379ffb0776 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -448,7 +448,7 @@ project-templates: - name: periodic-jobs-with-oslo-master periodic: - 'periodic-{name}-py27-with-oslo-master' - - 'periodic-{name}-py34-with-oslo-master' + - 'periodic-{name}-py35-with-oslo-master' - name: periodic-jobs-with-neutron-lib-master periodic: