From 71f3b63c1bd03ec9c257fa899eabd20d6411b710 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 10 Jul 2013 11:10:51 -0700 Subject: [PATCH] Correct PBR's gate_hook function. * modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml: Previously devstack-vm-gate.sh was run with bash -xe neither are necessary and the -e makes the test fail when it shouldn't (devstack-gate relies on internal non zero return codes). Remove these bash options and run the PBR integration script with -xe instead. Change-Id: If77e17af5be714ee2e3c529d3cfbed1ec7a5f5b2 Reviewed-on: https://review.openstack.org/36518 Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../files/jenkins_job_builder/config/pbr.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml b/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml index 8cdc047e83..261ef45d0e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml @@ -23,8 +23,8 @@ export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 function gate_hook { - bash -xe $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \ - $BASE/new/pbr/tools/integration.sh $PROJECTS $BASE + bash $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \ + bash -xe $BASE/new/pbr/tools/integration.sh $PROJECTS $BASE } function post_test_hook { cp /home/jenkins/.pip/pip.log ./pip.log