osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43492?usp=email )
Change subject: jobs/ttcn3-testsuites-testenv: _cache -> cache
......................................................................
jobs/ttcn3-testsuites-testenv: _cache -> cache
Now that the directory structure of osmo-ttcn3-hacks gets cloned to
$WORKSPACE/src/osmo-ttcn3-hacks instead of $WORKSPACE, we don't need to
add an underscore to the cache dir anymore to visually separate it from
the other directories. The workspace now looks like this:
cache/
logs/
src/
Change-Id: I1bb85a8ad299b4bb1ecd1b9285b3ebec48220330
---
M jobs/ttcn3-testsuites-testenv.yml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml
index e9a5756..35af150 100644
--- a/jobs/ttcn3-testsuites-testenv.yml
+++ b/jobs/ttcn3-testsuites-testenv.yml
@@ -665,7 +665,7 @@
# Examples:
# * …/podman/var-cache-apt-debian-trixie/archives/partial
# * …/podman/var-lib-apt-debian-trixie/lists/partial
- for i in _cache/podman/var-*-apt-*/*/partial; do
+ for i in cache/podman/var-*-apt-*/*/partial; do
if [ -e "$i" ]; then
podman run \
--rm \
@@ -676,7 +676,7 @@
fi
done
- rm -rf logs _cache src/osmo-ttcn3-hacks/.linux
+ rm -rf logs cache src/osmo-ttcn3-hacks/.linux
if [ "$KERNEL" != "none" ]; then
mv linux src/osmo-ttcn3-hacks/.linux
@@ -699,7 +699,7 @@
if ! src/osmo-ttcn3-hacks/testenv.py run \
{testsuite} \
--podman \
- --cache "$PWD"/_cache \
+ --cache "$PWD"/cache \
--ccache ~/ccache/testenv \
--log-dir "$PWD"/logs \
$TESTENV_ARGS; then
@@ -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 src
+ rm -rf cache src
fi
uptime | grep --color=always -o "load.*"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43492?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: I1bb85a8ad299b4bb1ecd1b9285b3ebec48220330
Gerrit-Change-Number: 43492
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43493?usp=email )
Change subject: jobs/ttcn3-testsuites-testenv: fix stray linux file
......................................................................
jobs/ttcn3-testsuites-testenv: fix stray linux file
Fix that if the kernel is set to "none", we keep a dummy linux file in
the top directory.
Change-Id: I2e936fc2aef144ca2a55e47508e2abb2730e04e2
---
M jobs/ttcn3-testsuites-testenv.yml
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml
index 35af150..0b5dba7 100644
--- a/jobs/ttcn3-testsuites-testenv.yml
+++ b/jobs/ttcn3-testsuites-testenv.yml
@@ -678,7 +678,9 @@
rm -rf logs cache src/osmo-ttcn3-hacks/.linux
- if [ "$KERNEL" != "none" ]; then
+ if [ "$KERNEL" = "none" ]; then
+ rm linux
+ else
mv linux src/osmo-ttcn3-hacks/.linux
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43493?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: I2e936fc2aef144ca2a55e47508e2abb2730e04e2
Gerrit-Change-Number: 43493
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>