diff --git a/.zuul.yaml b/.zuul.yaml index 8ad9111c50..c9487c2387 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -61,6 +61,46 @@ neutron: 1 tempest: 0 branch_override: default + devstack_python3: 1 + +- job: + name: magnum-functional-base-python2 + parent: legacy-dsvm-base + timeout: 7800 + nodeset: legacy-ubuntu-xenial + pre-run: playbooks/pre/prepare-workspace.yaml + run: playbooks/magnum-functional-base.yaml + post-run: playbooks/post/upload-logs.yaml + required-projects: + - openstack-infra/devstack-gate + - openstack/diskimage-builder + - openstack/ironic + - openstack/ironic-lib + - openstack/ironic-python-agent + - openstack/magnum + - openstack/magnum-tempest-plugin + - openstack/pyghmi + - openstack/python-ironicclient + - openstack/python-magnumclient + - openstack/virtualbmc + irrelevant-files: + - ^.*\.rst$ + - ^api-ref/.*$ + - ^doc/.*$ + - ^specs/.*$ + - ^install-guide/.*$ + - ^releasenotes/.*$ + - ^dockerfiles/.*$ + vars: + ironic: 0 + ceilometer: 0 + swift: 0 + horizon: 0 + multinode: 0 + neutron: 1 + tempest: 0 + branch_override: default + devstack_python3: 0 - job: name: magnum-functional-multinode-base @@ -98,6 +138,7 @@ neutron: 1 tempest: 0 branch_override: default + devstack_python3: 1 - job: name: magnum-functional-api @@ -105,6 +146,12 @@ vars: coe: api +- job: + name: magnum-functional-api-python2 + parent: magnum-functional-base-python2 + vars: + coe: api + - job: name: magnum-functional-coe parent: magnum-functional-base @@ -333,6 +380,7 @@ check: jobs: - magnum-functional-api + - magnum-functional-api-python2 - magnum-functional-k8s - magnum-functional-swarm-mode - openstack-tox-cover: @@ -342,6 +390,7 @@ queue: magnum jobs: - magnum-functional-api + - magnum-functional-api-python2 experimental: jobs: - magnum-functional-dcos diff --git a/playbooks/magnum-functional-base.yaml b/playbooks/magnum-functional-base.yaml index 4eceed72fa..8fbd1b7dce 100644 --- a/playbooks/magnum-functional-base.yaml +++ b/playbooks/magnum-functional-base.yaml @@ -19,6 +19,12 @@ set -x export PYTHONUNBUFFERED=true + if [ "{{ devstack_python3 }}" -eq 1 ] ; then + export DEVSTACK_GATE_USE_PYTHON3=True + else + export DEVSTACK_GATE_USE_PYTHON3=False + fi + if [ "{{ neutron }}" -eq 1 ] ; then export DEVSTACK_GATE_NEUTRON=1 fi