[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-runner: fix syntax errors

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38188?usp=email ) Change subject: jobs/osmo-gsm-tester-runner: fix syntax errors ...................................................................... jobs/osmo-gsm-tester-runner: fix syntax errors Fix the syntax of this file, so it is compatible with Jenkins Job Builder 6.3.0. * In shell blocks, {{ and }} needs to be used instead of { and } if the string in brackets does not refer to a JJB variable. * "${OSMO_GSM_TESTER_BRANCH}" would refer to a non-existing JJB var, instead we want the shell variable here (that jenkins sets), so omit the {}. Change-Id: I5401d75ac40b8267b59443792079249f00b02111 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 4909fe7..259436c 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -34,7 +34,7 @@ - git: url: https://gerrit.osmocom.org/osmo-gsm-tester branches: - - ${OSMO_GSM_TESTER_BRANCH} + - '$OSMO_GSM_TESTER_BRANCH' wipe-workspace: false skip-tag: true basedir: osmo-gsm-tester @@ -227,14 +227,14 @@ repo: osmo-gsm-tester_build-osmocom-bb - shell: | # Set a trap to fix workspace permissions / kill the docker container on exit - clean_up() { + clean_up() {{ docker kill "osmo-gsm-tester-virtual" || true docker run --rm \ -v "$WORKSPACE":/workspace \ debian:bullseye \ chmod -R a+rwX /workspace/ - } - clean_up_trap() { + }} + clean_up_trap() {{ set +x echo echo "### Clean up ###" @@ -243,7 +243,7 @@ trap - EXIT INT TERM 0 clean_up - } + }} trap clean_up_trap EXIT INT TERM 0 # Make sure no test results from a previous run remain @@ -281,7 +281,7 @@ --name=osmo-gsm-tester-virtual \ --cap-add=sys_nice \ $USER/osmo-gsm-tester \ - /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' + /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${{PATH}}" ./osmo-gsm-tester/contrib/jenkins-run.sh' publishers: - archive: artifacts: '*-run.tgz, *-bin.tgz' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5401d75ac40b8267b59443792079249f00b02111 Gerrit-Change-Number: 38188 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>