diff --git a/jenkins/jobs/nodepool.yaml b/jenkins/jobs/nodepool.yaml index 59ace0fb99..d65f85e902 100644 --- a/jenkins/jobs/nodepool.yaml +++ b/jenkins/jobs/nodepool.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-dsvm-nodepool{suffix}' + name: '{pipeline}-dsvm-nodepool{python}{suffix}' node: '{node}' wrappers: @@ -13,6 +13,9 @@ - devstack-checkout - shell: | #!/bin/bash -xe + if [ "{python}" == "-py35" ]; then + export DEVSTACK_GATE_USE_PYTHON3=true + fi export PYTHONUNBUFFERED=true # Disable tempest as nodepool is talking to the cloud not tempest. export DEVSTACK_GATE_TEMPEST=0 @@ -59,7 +62,7 @@ - console-log - job-template: - name: '{pipeline}-dsvm-nodepool{images}-src{suffix}' + name: '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}' node: '{node}' wrappers: @@ -73,6 +76,9 @@ - devstack-checkout - shell: | #!/bin/bash -xe + if [ "{python}" == "py35" ]; then + export DEVSTACK_GATE_USE_PYTHON3=true + fi export PYTHONUNBUFFERED=true # Disable tempest as nodepool is talking to the cloud not tempest. export DEVSTACK_GATE_TEMPEST=0 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 6fd6c0daa6..0048c17525 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -4083,26 +4083,30 @@ python: python2 suffix: '' tests: '' - - '{pipeline}-dsvm-nodepool{images}-src{suffix}': + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': pipeline: gate + python: '' node: ubuntu-xenial images: '-debian' suffix: '-nv' branch-override: 'default' - - '{pipeline}-dsvm-nodepool{images}-src{suffix}': + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': pipeline: gate + python: '' node: ubuntu-xenial images: '-opensuse' suffix: '-nv' branch-override: 'default' - - '{pipeline}-dsvm-nodepool{images}-src{suffix}': + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': pipeline: gate + python: '' node: ubuntu-xenial images: '-redhat' suffix: '-nv' branch-override: 'default' - - '{pipeline}-dsvm-nodepool{images}-src{suffix}': + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': pipeline: gate + python: '' node: ubuntu-xenial images: '-ubuntu' suffix: '-nv' @@ -8541,17 +8545,27 @@ - 'gate-{name}-python35-nv' - pypi-jobs - infra-publish-jobs - - '{pipeline}-dsvm-nodepool{suffix}': + - '{pipeline}-dsvm-nodepool{python}{suffix}': pipeline: gate + python: '' node: ubuntu-xenial suffix: '' branch-override: 'default' - - '{pipeline}-dsvm-nodepool{images}-src{suffix}': + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': pipeline: gate + python: '' node: ubuntu-xenial images: '' suffix: '-nv' branch-override: 'default' + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': + pipeline: gate + python: '-py35' + node: ubuntu-xenial + images: '' + suffix: '-nv' + branch-override: 'default' + - project: name: nose-html-output @@ -14075,8 +14089,9 @@ node: ubuntu-xenial suffix: '-nv' branch-override: default - - '{pipeline}-dsvm-nodepool{images}-src{suffix}': + - '{pipeline}-dsvm-nodepool{python}{images}-src{suffix}': pipeline: gate + python: '' node: ubuntu-xenial images: '' suffix: '' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 7f065f2261..ef3ac23253 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4345,6 +4345,7 @@ projects: - nodepool-coverage-ubuntu-trusty - nodepool-coverage-ubuntu-xenial experimental: + - gate-dsvm-nodepool-py35-src-nv - gate-zuul-nodepool - name: openstack-infra/nose-html-output