From f7d8a940957f239dc66f70c62f3f330c6e62d154 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 8 Jul 2013 22:45:59 -0700 Subject: [PATCH] Use proper ant file glob for copying pip.log. * modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml: Jenkins requires a proper ant file glob as the source for the scp plugin. The originally provided fully rooted path does not meet this criteria. Copy the pip log from Jenkins' homedir to the job workspace and swap the SCP file path with an ant glob that is valid. Change-Id: If9f00a9c699d62ba38f46b55b52ef86203631fae Reviewed-on: https://review.openstack.org/36178 Reviewed-by: James E. Blair Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- .../files/jenkins_job_builder/config/pbr.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 407c60dab1..8cdc047e83 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml @@ -22,9 +22,14 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 - function post_test_hook { - bash -xe $BASE/new/pbr/tools/integration.sh $PROJECTS $BASE + function gate_hook { + bash -xe $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \ + $BASE/new/pbr/tools/integration.sh $PROJECTS $BASE } + function post_test_hook { + cp /home/jenkins/.pip/pip.log ./pip.log + } + export -f gate_hook export -f post_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -35,7 +40,7 @@ site: 'static.openstack.org' files: - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' - source: '/home/jenkins/.pip/pip.log' + source: '**/pip.log' keep-hierarchy: false copy-after-failure: true - console-log