diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 639d366676..308ba3e396 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -13387,14 +13387,9 @@ name: requirements-jobs jobs: - - '{pipeline}-requirements-integration-dsvm{variant}-{node}': + - '{pipeline}-requirements-integration-dsvm-{node}': pipeline: gate node: ubuntu-trusty - variant: '' - - '{pipeline}-requirements-integration-dsvm{variant}-{node}': - pipeline: gate - node: ubuntu-trusty - variant: '-resolver' - '{pipeline}-pbr-installation-dsvm{variant}-{node}': pipeline: gate node: ubuntu-trusty @@ -13403,14 +13398,9 @@ pipeline: gate node: ubuntu-trusty variant: '-upstream' - - '{pipeline}-requirements-integration-dsvm{variant}-{node}': + - '{pipeline}-requirements-integration-dsvm-{node}': pipeline: gate node: ubuntu-xenial - variant: '' - - '{pipeline}-requirements-integration-dsvm{variant}-{node}': - pipeline: gate - node: ubuntu-xenial - variant: '-resolver' - '{pipeline}-pbr-installation-dsvm{variant}-{node}': pipeline: gate node: ubuntu-xenial diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml index 5b155e3482..e343d14224 100644 --- a/jenkins/jobs/requirements.yaml +++ b/jenkins/jobs/requirements.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-requirements-integration-dsvm{variant}-{node}' + name: '{pipeline}-requirements-integration-dsvm-{node}' node: '{node}' wrappers: @@ -114,9 +114,6 @@ 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 68fc0047c3..303ccd5d84 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1773,12 +1773,6 @@ jobs: - name: gate-requirements-integration-dsvm-ubuntu-trusty branch: ^(stable/(liberty|mitaka|newton)|master)$ - - name: gate-requirements-integration-dsvm-resolver-ubuntu-trusty - voting: false - - - name: gate-requirements-integration-dsvm-resolver-ubuntu-xenial - voting: false - - name: ^gate-requirements-tox-validate-ubuntu-xenial$ branch: ^(?!stable/(kilo|liberty|mitaka)).*$ @@ -15997,8 +15991,6 @@ projects: - gate-requirements-python27-ubuntu-xenial - gate-requirements-integration-dsvm-ubuntu-trusty - gate-requirements-integration-dsvm-ubuntu-xenial - - gate-requirements-integration-dsvm-resolver-ubuntu-trusty - - gate-requirements-integration-dsvm-resolver-ubuntu-xenial - gate-requirements-tox-babel-ubuntu-xenial - gate-requirements-tox-py27-check-uc-ubuntu-trusty - gate-requirements-tox-py27-check-uc-ubuntu-xenial