openstack/project-config
Code Issues Proposed changes

Move py34-with-oslo-master jobs to xenial

Browse Source 
Use py35 instead of py35 and run all jobs on xenial.

Update everywhere for the change.

Change-Id: Iac709afe104b8242b8a99946f823afb8a310533c
This commit is contained in:
Andreas Jaeger
2016-09-27 19:49:48 +02:00
parent baa5e292dc
commit 3fec872391
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
grafana/neutron.yaml
View File

@@ -37,7 +37,7 @@ dashboard:
span: 4 span: 4
targets: 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-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') - 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 type: graph
- title: Graphs - title: Graphs

4
jenkins/jobs/python-jobs.yaml
View File

@@ -212,7 +212,7 @@
- job-template: - job-template:
name: 'periodic-{name}-{python}-with-oslo-master' name: 'periodic-{name}-{python}-with-oslo-master'
node: ubuntu-trusty node: ubuntu-xenial
wrappers: wrappers:
- build-timeout: - build-timeout:
@@ -614,7 +614,7 @@
- 'periodic-{name}-{python}-with-oslo-master': - 'periodic-{name}-{python}-with-oslo-master':
python: python:
- py27 - py27
- py34 - py35
- job-group: - job-group:
name: periodic-python-jobs-with-neutron-lib-master name: periodic-python-jobs-with-neutron-lib-master

8
jenkins/scripts/run-tox-with-oslo-master.sh
View File

@@ -88,20 +88,20 @@ commands =
{[testenv]commands} {[testenv]commands}
EOF EOF
if grep "^\[testenv:py34\]" tox.ini if grep "^\[testenv:py35\]" tox.ini
then then
cat << EOF >> tox.ini cat << EOF >> tox.ini
[testenv:py34-oslo-master] [testenv:py35-oslo-master]
posargs = posargs =
commands = commands =
bash oslo-from-master.sh bash oslo-from-master.sh
{[testenv:py34]commands} {[testenv:py35]commands}
EOF EOF
else else
cat << EOF >> tox.ini cat << EOF >> tox.ini
[testenv:py34-oslo-master] [testenv:py35-oslo-master]
posargs = posargs =
commands = commands =
bash oslo-from-master.sh bash oslo-from-master.sh

2
zuul/layout.yaml
View File

@@ -448,7 +448,7 @@ project-templates:
- name: periodic-jobs-with-oslo-master - name: periodic-jobs-with-oslo-master
periodic: periodic:
- 'periodic-{name}-py27-with-oslo-master' - '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 - name: periodic-jobs-with-neutron-lib-master
periodic: periodic: