diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 291edab9b4..bf21e7ea03 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -433,6 +433,7 @@ job-suffix: '' branch-override: default - 'gate-telemetry-dsvm-integration-{name}' + - periodic-python-jobs-with-oslo-master - project: name: ceilometer-powervm @@ -515,6 +516,7 @@ node: devstack-trusty job-suffix: '' branch-override: default + - periodic-python-jobs-with-oslo-master - project: name: cinder-specs @@ -1723,6 +1725,7 @@ - openstack-releasenotes-jobs - 'gate-{name}-tox-{envlist}': envlist: bandit + - periodic-python-jobs-with-oslo-master - project: name: glance-specs @@ -1971,6 +1974,7 @@ - translation-jobs-liberty - gate-rally-dsvm-fakevirt-{name} - openstack-releasenotes-jobs + - periodic-python-jobs-with-oslo-master - project: name: heat-cfnclient @@ -2233,6 +2237,7 @@ node: 'tripleo-f22' trigger: 'gate' branch-override: default + - periodic-python-jobs-with-oslo-master - project: name: ironic-inspector @@ -2388,6 +2393,7 @@ job-suffix: '' branch-override: default node: devstack-trusty + - periodic-python-jobs-with-oslo-master - project: name: keystone-specs @@ -3449,6 +3455,7 @@ job-suffix: '' branch-override: default which: pecan + - periodic-python-jobs-with-oslo-master - project: name: neutron-classifier diff --git a/jenkins/scripts/run-tox-with-oslo-master.sh b/jenkins/scripts/run-tox-with-oslo-master.sh index ebdc569250..3828f09229 100755 --- a/jenkins/scripts/run-tox-with-oslo-master.sh +++ b/jenkins/scripts/run-tox-with-oslo-master.sh @@ -71,10 +71,16 @@ EOF sed -ri 's/\{posargs\}//g' tox.ini cat << EOF >> tox.ini + [testenv:py27-oslo-master] commands = bash oslo-from-master.sh {[testenv]commands} +EOF + +if grep "^\[testenv:py34\]" tox.ini +then +cat << EOF >> tox.ini [testenv:py34-oslo-master] posargs = @@ -82,5 +88,15 @@ commands = bash oslo-from-master.sh {[testenv:py34]commands} EOF +else +cat << EOF >> tox.ini + +[testenv:py34-oslo-master] +posargs = +commands = + bash oslo-from-master.sh + {[testenv]commands} +EOF +fi $script_path/run-tox.sh $venv-oslo-master diff --git a/zuul/layout.yaml b/zuul/layout.yaml index eed1451703..18d4b16594 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4130,6 +4130,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: translation-jobs - name: translation-jobs-liberty @@ -4212,6 +4213,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: integrated-gate - name: grenade @@ -5570,6 +5572,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: integrated-gate - name: grenade @@ -5718,6 +5721,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: translation-jobs - name: translation-jobs-liberty @@ -5881,6 +5885,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: translation-jobs - name: translation-jobs-liberty @@ -6014,6 +6019,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: integrated-gate - name: grenade @@ -6856,6 +6862,7 @@ projects: - name: openstack-server-release-jobs - name: periodic-kilo - name: periodic-liberty-constraints + - name: periodic-jobs-with-oslo-master - name: check-requirements - name: integrated-gate-neutron - name: translation-jobs