summaryrefslogtreecommitdiffstats
path: root/scripts/repo-install-test.sh
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2020-05-26 15:12:29 +0200
committerOliver Smith <osmith@sysmocom.de>2020-05-26 15:18:45 +0200
commit6eb528704c68305e5362634c3103e6883b6d8797 (patch)
tree73724aa39a5c7507b0a04682df26556faaf9aa06 /scripts/repo-install-test.sh
parent2601ffcc00ba1458c07991f9187bfef265af2e63 (diff)
repo-install-test: integrate
Make the script run from its new location. Related: OS#4563 Change-Id: Ib6fbc4b9487a84e0c28cd8b0622ddc2d5b1dfe14
Diffstat (limited to 'scripts/repo-install-test.sh')
-rwxr-xr-xscripts/repo-install-test.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh
index c0c38c5..a93fb23 100755
--- a/scripts/repo-install-test.sh
+++ b/scripts/repo-install-test.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-. ../jenkins-common.sh
+. "$(dirname "$0")/common.sh"
docker_images_require "debian-repo-install-test"
[ -z "$FEED" ] && FEED="nightly"
@@ -30,8 +30,8 @@ fi
# * /run, /tmp, cgroups, SYS_ADMIN: needed for systemd
# * SYS_NICE: needed for changing CPUScheduling{Policy,Priority} (osmo-bts systemd service files)
docker run --rm \
- -v "$PWD/testdata:/testdata:ro" \
- -v "$VOL_BASE_DIR:/data" \
+ -v "$OSMO_CI_DIR/scripts/repo-install-test:/repo-install-test:ro" \
+ -v "$OSMO_CI_DIR/_repo_install_test_data:/data" \
--name "$CONTAINER" \
-e FEED="$FEED" \
-e container=docker \
@@ -40,12 +40,12 @@ docker run --rm \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \
--cap-add SYS_ADMIN \
--cap-add SYS_NICE \
- "$REPO_USER/debian-repo-install-test" \
+ "$USER/debian-repo-install-test" \
/lib/systemd/systemd &
check_if_systemd_is_running
# Run the test script
-docker exec "$CONTAINER" /testdata/repo-install-test.sh
+docker exec "$CONTAINER" /repo-install-test/run-inside-docker.sh
ret="$?"
# Interactive shell