osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43496?usp=email )
Change subject: eim: set mp_restop_path using TESTENV_SRC_DIR
......................................................................
eim: set mp_restop_path using TESTENV_SRC_DIR
* Use $TESTENV_SRC_DIR instead of ../../, as the latter may not always be
the directory where the sources get cloned.
* Adjust the path in eIM_Tests.cfg instead of copying restop.py to the
logs dir and starting it from there.
* Change onomondo-eim/contrib/rest_api_usage_example/restop.py to
onomondo-eim/contrib/restop.py as that seems to be the proper path
on current master:
https://gerrit.osmocom.org/plugins/gitiles/onomondo-eim/+/refs/heads/master…
Change-Id: I2ee9a487b2eb77485f09133918d91d6d7275d4c6
---
A eim/prepare.sh
M eim/testenv.cfg
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/43496/1
diff --git a/eim/prepare.sh b/eim/prepare.sh
new file mode 100755
index 0000000..1cb2d57
--- /dev/null
+++ b/eim/prepare.sh
@@ -0,0 +1,9 @@
+#!/bin/sh -ex
+
+# Set mp_restop_path
+RESTOP="$TESTENV_SRC_DIR"/onomondo-eim/contrib/restop.py
+test -e "$RESTOP"
+sed \
+ -i \
+ "s,^eIM_Tests\.mp_restop_path := .*,eIM_Tests.mp_restop_path := \"$RESTOP\"," \
+ eIM_Tests.cfg
diff --git a/eim/testenv.cfg b/eim/testenv.cfg
index bf404f5..b375fec 100644
--- a/eim/testenv.cfg
+++ b/eim/testenv.cfg
@@ -1,7 +1,8 @@
[testsuite]
program=eIM_Tests
config=eIM_Tests.cfg
-copy=../../onomondo-eim/contrib/rest_api_usage_example/restop.py ../ipad/example_ca/pki/private/alttest.key ../ipad/example_ca/pki/issued/alttest.crt
+copy=../ipad/example_ca/pki/private/alttest.key ../ipad/example_ca/pki/issued/alttest.crt
+prepare=prepare.sh
[eim]
program=onomondo-eim -c "$TESTENV_INSTALL_DIR"/etc/osmocom/onomondo-eim.config -r "$TESTENV_INSTALL_DIR"/usr/lib/onomondo-eim -m ./mnesia_db -l debug
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43496?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2ee9a487b2eb77485f09133918d91d6d7275d4c6
Gerrit-Change-Number: 43496
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43490?usp=email )
Change subject: jobs/ttcn3-testsuites-testenv: remove obsolete var
......................................................................
jobs/ttcn3-testsuites-testenv: remove obsolete var
TESTENV_COREDUMP_FROM_LXC_HOST is obsolete, this was for a custom helper
running on the host. Instead of that we just save the coredump to the
current working dir and retrieve it from there.
Related: osmo-ttcn3-hacks Ia765b01432e4cb4cd36c45de874b966e3ebf55bc
Change-Id: I67fd0cc17cce44da4da00a6ac26540d8c1172168
---
M jobs/ttcn3-testsuites-testenv.yml
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/90/43490/1
diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml
index aa426b8..5a94b4e 100644
--- a/jobs/ttcn3-testsuites-testenv.yml
+++ b/jobs/ttcn3-testsuites-testenv.yml
@@ -691,7 +691,6 @@
export TESTENV_SOURCE_HIGHLIGHT_COLORS="esc"
export TESTENV_NO_IMAGE_UP_TO_DATE_CHECK=1
export TESTENV_NO_KVM=1
- export TESTENV_COREDUMP_FROM_LXC_HOST=1
set -x
uptime | grep --color=always -o "load.*"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43490?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I67fd0cc17cce44da4da00a6ac26540d8c1172168
Gerrit-Change-Number: 43490
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
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(a)osmocom.org'
wipe-workspace: false
+ basedir: src/osmo-ttcn3-hacks
triggers:
- timed: "{obj:timer}"
publishers:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43491?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib7c4324df58aad6adca2abf5e72e9b8753842714
Gerrit-Change-Number: 43491
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/43492/1
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: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I1bb85a8ad299b4bb1ecd1b9285b3ebec48220330
Gerrit-Change-Number: 43492
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/93/43493/1
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: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2e936fc2aef144ca2a55e47508e2abb2730e04e2
Gerrit-Change-Number: 43493
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>