osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/30470
)
Change subject: repo-install-test: run without SYS_ADMIN
......................................................................
repo-install-test: run without SYS_ADMIN
Similar to the last patch, this doesn't work with podman. Disable
checking if the osmo-pcap-client service works for now.
Related: OS#5365
Change-Id: I72a29b75b67d9d80ce357c0fc6054fe731ec9ce2
---
M scripts/repo-install-test.sh
M scripts/repo-install-test/run-inside-podman.sh
2 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/30470/1
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index 0ee0bec..ebc1488 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -96,7 +96,6 @@
# Run the container
# * This does not output anything, for debugging add -it and remove &.
-# * SYS_ADMIN: needed for osmo-pcap-client
podman run --rm \
-v "$OSMO_CI_DIR/scripts/repo-install-test:/repo-install-test:ro" \
--name "$CONTAINER" \
@@ -106,7 +105,6 @@
-e DISTRO="$DISTRO" \
-e TESTS="$TESTS" \
-e container=podman \
- --cap-add SYS_ADMIN \
--systemd=always \
$args \
"$IMAGE" \
diff --git a/scripts/repo-install-test/run-inside-podman.sh
b/scripts/repo-install-test/run-inside-podman.sh
index 19cb3db..b70f894 100755
--- a/scripts/repo-install-test/run-inside-podman.sh
+++ b/scripts/repo-install-test/run-inside-podman.sh
@@ -12,6 +12,7 @@
# * osmo-ctrl2cgi (missing config: /etc/osmocom/ctrl2cgi.ini, OS#4108)
# * osmo-trap2cgi (missing config: /etc/osmocom/%N.ini, OS#4108)
# * osmo-ggsn (no tun device in podman)
+# * osmo-pcap-client (needs SYS_ADMIN for packet filtering with default config)
SERVICES="
osmo-bsc
osmo-bts-virtual
@@ -21,7 +22,6 @@
osmo-hnbgw
osmo-mgw
osmo-msc
- osmo-pcap-client
osmo-pcu
osmo-sgsn
osmo-sip-connector
--
To view, visit
https://gerrit.osmocom.org/c/osmo-ci/+/30470
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I72a29b75b67d9d80ce357c0fc6054fe731ec9ce2
Gerrit-Change-Number: 30470
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange