osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43491?usp=email )
Change subject: jobs/ttcn3-testsuites-testenv: set basedir ......................................................................
jobs/ttcn3-testsuites-testenv: set basedir
Clone the osmo-ttcn3-hacks repository to $WORKSPACE/src/osmo-ttcn3-hacks instead of $WORKSPACE. This is in preparation for building programs from source with these jobs for which we don't build binary packages (onomondo-ipa, -eim), which requires cloning additional repositories to a sibling directory of osmo-ttcn3-hacks (now $WORKSPACE/src).
As side effect, this also makes the directory structure easier to browser as the logs and cache dirs are not mixed with the osmo-ttcn3-hacks directory structure anymore.
Furthermore 3rd party repositories in osmo-ttcn3-hacks/deps are not cached anymore between runs. This saves disk space at the expense of cloning them again at the start of job runs. This trade-off is acceptable now that we are cloning these repositories from the Osmocom mirrors (https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43245).
Change-Id: Ib7c4324df58aad6adca2abf5e72e9b8753842714 --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/43491/1
diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 5a94b4e..e9a5756 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -676,10 +676,10 @@ fi done
- rm -rf logs _cache .linux + rm -rf logs _cache src/osmo-ttcn3-hacks/.linux
if [ "$KERNEL" != "none" ]; then - mv linux .linux + mv linux src/osmo-ttcn3-hacks/.linux fi
set +x # Don't output the color codes we set here @@ -696,7 +696,7 @@ uptime | grep --color=always -o "load.*"
RC=0 - if ! ./testenv.py run \ + if ! src/osmo-ttcn3-hacks/testenv.py run \ {testsuite} \ --podman \ --cache "$PWD"/_cache \ @@ -709,7 +709,7 @@ # Free up space from downloaded apt packages, build artifacts etc. # The osmo-ttcn3-hacks deps dir and ccache are persistent. if [ "$RC" = 0 ]; then - rm -rf _cache .linux + rm -rf _cache src fi
uptime | grep --color=always -o "load.*" @@ -723,6 +723,7 @@ git-config-name: 'Jenkins Builder' git-config-email: 'jenkins@osmocom.org' wipe-workspace: false + basedir: src/osmo-ttcn3-hacks triggers: - timed: "{obj:timer}" publishers: