diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 21940a4c61..b00fef40f7 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1427,6 +1427,12 @@ - '{pipeline}-requirements-integration-dsvm': pipeline: check node: 'devstack-precise || devstack-trusty' + - '{pipeline}-pbr-installation-dsvm': + pipeline: gate + node: 'devstack-precise || devstack-trusty' + - '{pipeline}-pbr-installation-dsvm': + pipeline: check + node: 'devstack-precise || devstack-trusty' - project: name: sahara-dashboard diff --git a/jenkins/jobs/requirements.yaml b/jenkins/jobs/requirements.yaml index 7a8e498583..263784f897 100644 --- a/jenkins/jobs/requirements.yaml +++ b/jenkins/jobs/requirements.yaml @@ -2,6 +2,40 @@ name: '{pipeline}-requirements-integration-dsvm' node: '{node}' + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_GATE_REQS_INTEGRATION=1 + export PIP_PROCESS_DEPENDENCY_LINKS=1 + function gate_hook {{ + set -x + bash $BASE/new/devstack-gate/devstack-vm-gate.sh && \ + bash -xe $BASE/new/requirements/tools/integration.sh $(cat $BASE/new/requirements/projects.txt) + }} + export -f gate_hook + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log + +- job-template: + name: '{pipeline}-pbr-installation-dsvm' + node: '{node}' + wrappers: - build-timeout: timeout: 125 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index be644a0b40..02ffb1d995 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3017,9 +3017,9 @@ projects: - name: pypy-jobs - name: experimental-tripleo-jobs check: - - check-requirements-integration-dsvm + - check-pbr-installation-dsvm gate: - - gate-requirements-integration-dsvm + - gate-pbr-installation-dsvm post: - pbr-coverage post: