fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33067 )

Change subject: fixup: contrib/jenkins: create workspace.tar.xz on error ......................................................................

fixup: contrib/jenkins: create workspace.tar.xz on error

cat-testlogs.sh does "exit 1", so no workspace.tar.xz is created. Call this script after archiving the workspace.

Change-Id: Ibcb842f32418e66a186d6b21bb5861cf4a0b7c4a Fixes: d33a66b779 "contrib/jenkins: create workspace.tar.xz on error" Related: OS#5665 --- M contrib/jenkins.sh 1 file changed, 15 insertions(+), 3 deletions(-)

Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index f9d944a..ba453e9 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -8,14 +8,12 @@ #

exit_tar_workspace() { - cat-testlogs.sh - if [ "$IS_MASTER_BUILD" = "1" ]; then tar -cJf "/tmp/workspace.tar.xz" "$base" mv /tmp/workspace.tar.xz "$base" fi

- exit 1 + cat-testlogs.sh }

if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then