diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 5d93916b78..c9657aa9c6 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1756,12 +1756,18 @@ name: requirements-jobs jobs: - - '{pipeline}-requirements-integration-dsvm': + - '{pipeline}-requirements-integration-dsvm{variant}': pipeline: gate node: 'devstack-precise || devstack-trusty' - - '{pipeline}-requirements-integration-dsvm': + variant: '' + - '{pipeline}-requirements-integration-dsvm{variant}': pipeline: check node: 'devstack-precise || devstack-trusty' + variant: '' + - '{pipeline}-requirements-integration-dsvm{variant}': + pipeline: check + node: 'devstack-precise || devstack-trusty' + variant: '-resolver' - '{pipeline}-pbr-installation-dsvm{variant}': pipeline: gate node: 'devstack-precise || devstack-trusty' diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml index 69f754e4ec..8c7494c997 100644 --- a/jenkins/jobs/requirements.yaml +++ b/jenkins/jobs/requirements.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-requirements-integration-dsvm' + name: '{pipeline}-requirements-integration-dsvm{variant}' node: '{node}' wrappers: @@ -19,6 +19,9 @@ export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_REQS_INTEGRATION=1 export PIP_PROCESS_DEPENDENCY_LINKS=1 + if [ "{variant}" = "-resolver" ]; then + export PBR_PIP_VERSION=git+https://github.com/rbtcollins/pip.git@issue-988#egg=pip + fi function gate_hook {{ set -x bash $BASE/new/devstack-gate/devstack-vm-gate.sh && \ diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 37a1497cc6..d7b53be794 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -618,6 +618,9 @@ jobs: - ^.*\.rst$ - ^doc/.*$ + - name: check-requirements-integration-dsvm-resolver + voting: false + - name: gate-tempest-dsvm-full queue-name: integrated @@ -3289,6 +3292,7 @@ projects: - gate-requirements-pep8 - gate-requirements-python27 - check-requirements-integration-dsvm + - check-requirements-integration-dsvm-resolver - check-devstack-dsvm-cells - check-swift-dsvm-functional gate: