Add python3 functional tests to shade

We should make sure that running shade's functional tests under python3
works.

Start off non-voting, but if it passes, we'll flip the switch quickly.

Change-Id: Iffb9f6767c30d171a12481ccd1df502b7aabc4f4
This commit is contained in:
Monty Taylor 2017-05-19 10:06:19 -05:00
parent 401774b848
commit eb2ed55b96
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 22 additions and 4 deletions

View File

@ -14064,21 +14064,31 @@
node: ubuntu-xenial node: ubuntu-xenial
suffix: '-nv' suffix: '-nv'
branch-override: stable/newton branch-override: stable/newton
- '{pipeline}-shade-dsvm-functional-libs{suffix}': - '{pipeline}-shade-dsvm-functional-libs{python}{suffix}':
pipeline: gate pipeline: gate
node: ubuntu-xenial node: ubuntu-xenial
suffix: '-nv' suffix: '-nv'
branch-override: default branch-override: default
python:
- ''
- '-py35'
- '{pipeline}-shade-dsvm-functional-magnum{suffix}': - '{pipeline}-shade-dsvm-functional-magnum{suffix}':
pipeline: gate pipeline: gate
node: ubuntu-xenial node: ubuntu-xenial
suffix: '-nv' suffix: '-nv'
branch-override: default branch-override: default
- '{pipeline}-shade-dsvm-functional-neutron{suffix}': - '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}':
pipeline: gate pipeline: gate
node: ubuntu-xenial node: ubuntu-xenial
suffix: '' suffix: ''
branch-override: default 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}-shade-dsvm-ansible{suffix}':
pipeline: gate pipeline: gate
node: ubuntu-xenial node: ubuntu-xenial

View File

@ -115,7 +115,7 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-shade-dsvm-functional-neutron{suffix}' name: '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -135,6 +135,9 @@
export SHADE_HAS_MAGNUM=0 export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=1 export SHADE_HAS_NEUTRON=1
export SHADE_HAS_SWIFT=1 export SHADE_HAS_SWIFT=1
if [ "{python}" == "-py35" ]; then
export SHADE_TOX_PYTHON=python3
fi
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_HEAT=1
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
@ -226,7 +229,7 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-shade-dsvm-functional-libs{suffix}' name: '{pipeline}-shade-dsvm-functional-libs{python}{suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -246,6 +249,9 @@
export SHADE_HAS_MAGNUM=0 export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=1 export SHADE_HAS_NEUTRON=1
export SHADE_HAS_SWIFT=1 export SHADE_HAS_SWIFT=1
if [ "{python}" == "-py35" ]; then
export SHADE_TOX_PYTHON=python3
fi
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_HEAT=1
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"

View File

@ -5271,7 +5271,9 @@ projects:
- gate-shade-dsvm-functional-legacy - gate-shade-dsvm-functional-legacy
- gate-shade-dsvm-functional-legacy-libs-nv - gate-shade-dsvm-functional-legacy-libs-nv
- gate-shade-dsvm-functional-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
- gate-shade-dsvm-functional-neutron-py35-nv
- gate-shade-dsvm-ansible - gate-shade-dsvm-ansible
- gate-shade-dsvm-ansible-dev-nv - gate-shade-dsvm-ansible-dev-nv
- gate-dsvm-nodepool-src - gate-dsvm-nodepool-src