diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 4165bf74b2..809ce19fcc 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -14064,21 +14064,31 @@ node: ubuntu-xenial suffix: '-nv' branch-override: stable/newton - - '{pipeline}-shade-dsvm-functional-libs{suffix}': + - '{pipeline}-shade-dsvm-functional-libs{python}{suffix}': pipeline: gate node: ubuntu-xenial suffix: '-nv' branch-override: default + python: + - '' + - '-py35' - '{pipeline}-shade-dsvm-functional-magnum{suffix}': pipeline: gate node: ubuntu-xenial suffix: '-nv' branch-override: default - - '{pipeline}-shade-dsvm-functional-neutron{suffix}': + - '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}': pipeline: gate node: ubuntu-xenial suffix: '' branch-override: default + python: '' + - '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}': + pipeline: gate + node: ubuntu-xenial + suffix: '-nv' + branch-override: default + python: '-py35' - '{pipeline}-shade-dsvm-ansible{suffix}': pipeline: gate node: ubuntu-xenial diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml index 9cf0babe3c..d3735b65c2 100644 --- a/jenkins/jobs/shade.yaml +++ b/jenkins/jobs/shade.yaml @@ -115,7 +115,7 @@ - console-log - job-template: - name: '{pipeline}-shade-dsvm-functional-neutron{suffix}' + name: '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}' node: '{node}' wrappers: @@ -135,6 +135,9 @@ export SHADE_HAS_MAGNUM=0 export SHADE_HAS_NEUTRON=1 export SHADE_HAS_SWIFT=1 + if [ "{python}" == "-py35" ]; then + export SHADE_TOX_PYTHON=python3 + fi export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_HEAT=1 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" @@ -226,7 +229,7 @@ - console-log - job-template: - name: '{pipeline}-shade-dsvm-functional-libs{suffix}' + name: '{pipeline}-shade-dsvm-functional-libs{python}{suffix}' node: '{node}' wrappers: @@ -246,6 +249,9 @@ export SHADE_HAS_MAGNUM=0 export SHADE_HAS_NEUTRON=1 export SHADE_HAS_SWIFT=1 + if [ "{python}" == "-py35" ]; then + export SHADE_TOX_PYTHON=python3 + fi export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_HEAT=1 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 525d8ccea6..e950430270 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5271,7 +5271,9 @@ projects: - gate-shade-dsvm-functional-legacy - gate-shade-dsvm-functional-legacy-libs-nv - gate-shade-dsvm-functional-libs-nv + - gate-shade-dsvm-functional-libs-py35-nv - gate-shade-dsvm-functional-neutron + - gate-shade-dsvm-functional-neutron-py35-nv - gate-shade-dsvm-ansible - gate-shade-dsvm-ansible-dev-nv - gate-dsvm-nodepool-src