<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/18510">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: integrate<br><br>Make the script run from its new location.<br><br>Related: OS#4563<br>Change-Id: Ib6fbc4b9487a84e0c28cd8b0622ddc2d5b1dfe14<br>---<br>M .gitignore<br>M scripts/repo-install-test.sh<br>M scripts/repo-install-test/run-inside-docker.sh<br>3 files changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/10/18510/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 459f2c9..d6be3b5 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -10,6 +10,7 @@</span><br><span> _deps/</span><br><span> _release_tarballs/</span><br><span> _docker_playground</span><br><span style="color: hsl(120, 100%, 40%);">+_repo_install_test_data/</span><br><span> </span><br><span> # osmocom-nightly-packages.sh</span><br><span> nightly-3g_*</span><br><span>diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh</span><br><span>index c0c38c5..a93fb23 100755</span><br><span>--- a/scripts/repo-install-test.sh</span><br><span>+++ b/scripts/repo-install-test.sh</span><br><span>@@ -1,5 +1,5 @@</span><br><span> #!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-. ../jenkins-common.sh</span><br><span style="color: hsl(120, 100%, 40%);">+. "$(dirname "$0")/common.sh"</span><br><span> docker_images_require "debian-repo-install-test"</span><br><span> </span><br><span> [ -z "$FEED" ] && FEED="nightly"</span><br><span>@@ -30,8 +30,8 @@</span><br><span> # * /run, /tmp, cgroups, SYS_ADMIN: needed for systemd</span><br><span> # * SYS_NICE: needed for changing CPUScheduling{Policy,Priority} (osmo-bts systemd service files)</span><br><span> docker run       --rm \</span><br><span style="color: hsl(0, 100%, 40%);">-          -v "$PWD/testdata:/testdata:ro" \</span><br><span style="color: hsl(0, 100%, 40%);">-             -v "$VOL_BASE_DIR:/data" \</span><br><span style="color: hsl(120, 100%, 40%);">+          -v "$OSMO_CI_DIR/scripts/repo-install-test:/repo-install-test:ro" \</span><br><span style="color: hsl(120, 100%, 40%);">+         -v "$OSMO_CI_DIR/_repo_install_test_data:/data" \</span><br><span>          --name "$CONTAINER" \</span><br><span>              -e FEED="$FEED" \</span><br><span>          -e container=docker \</span><br><span>@@ -40,12 +40,12 @@</span><br><span>          -v /sys/fs/cgroup:/sys/fs/cgroup:ro \</span><br><span>                --cap-add SYS_ADMIN \</span><br><span>                --cap-add SYS_NICE \</span><br><span style="color: hsl(0, 100%, 40%);">-            "$REPO_USER/debian-repo-install-test" \</span><br><span style="color: hsl(120, 100%, 40%);">+             "$USER/debian-repo-install-test" \</span><br><span>                 /lib/systemd/systemd &</span><br><span> check_if_systemd_is_running</span><br><span> </span><br><span> # Run the test script</span><br><span style="color: hsl(0, 100%, 40%);">-docker exec "$CONTAINER" /testdata/repo-install-test.sh</span><br><span style="color: hsl(120, 100%, 40%);">+docker exec "$CONTAINER" /repo-install-test/run-inside-docker.sh</span><br><span> ret="$?"</span><br><span> </span><br><span> # Interactive shell</span><br><span>diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh</span><br><span>index 63e1819..135d2d6 100755</span><br><span>--- a/scripts/repo-install-test/run-inside-docker.sh</span><br><span>+++ b/scripts/repo-install-test/run-inside-docker.sh</span><br><span>@@ -59,7 +59,7 @@</span><br><span>                > /data/osmocom_packages_all.txt</span><br><span> </span><br><span>      # Remove comments from blacklist.txt (and sort it)</span><br><span style="color: hsl(0, 100%, 40%);">-      grep -v "^#" /testdata/blacklist.txt | sort -u > /data/blacklist.txt</span><br><span style="color: hsl(120, 100%, 40%);">+     grep -v "^#" /repo-install-test/blacklist.txt | sort -u > /data/blacklist.txt</span><br><span> </span><br><span>       # Install all repo packages which are not on the blacklist</span><br><span>   comm -23 /data/osmocom_packages_all.txt \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/18510">change 18510</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/18510"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib6fbc4b9487a84e0c28cd8b0622ddc2d5b1dfe14 </div>
<div style="display:none"> Gerrit-Change-Number: 18510 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>