<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/18518">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: don't mount /data<br><br>The "run-inside-docker.sh" script is running as root (in order to be<br>able to install packages). Do not mount an outside directory as /data<br>inside the image anymore, where the script would write temporary data.<br>This causes problems on jenkins, as the temporary files are written as<br>root and jenkins is then unable to wipe the workspace.<br><br>I had used this for debugging when I wrote the script initially, but<br>almost the same can be done now with INTERACTIVE=1 and cat on the<br>temporary files.<br><br>Related: OS#4563<br>Change-Id: If7e1d83580c2951e7e50181ba7e755b987675e4b<br>---<br>M scripts/repo-install-test.sh<br>M scripts/repo-install-test/run-inside-docker.sh<br>2 files changed, 9 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh</span><br><span>index 4bc0fab..ac8242d 100755</span><br><span>--- a/scripts/repo-install-test.sh</span><br><span>+++ b/scripts/repo-install-test.sh</span><br><span>@@ -52,7 +52,6 @@</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> -v "$OSMO_CI_DIR/scripts/repo-install-test:/repo-install-test:ro" \</span><br><span style="color: hsl(0, 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 DISTRO="$DISTRO" \</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 a6eda13..e0f07c2 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>@@ -94,15 +94,15 @@</span><br><span> echo "keepcache=1" >> /etc/dnf/dnf.conf</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Filter /data/osmocom_packages_all.txt through a blacklist_$DISTRO.txt and store the result in</span><br><span style="color: hsl(0, 100%, 40%);">-# /data/osmocom_packages.txt.</span><br><span style="color: hsl(120, 100%, 40%);">+# Filter $PWD/osmocom_packages_all.txt through a blacklist_$DISTRO.txt and store the result in</span><br><span style="color: hsl(120, 100%, 40%);">+# $PWD/osmocom_packages.txt.</span><br><span> filter_packages_txt() {</span><br><span> # Copy distro specific blacklist file, remove comments and sort it</span><br><span style="color: hsl(0, 100%, 40%);">- grep -v "^#" /repo-install-test/blacklist_$DISTRO.txt | sort -u > /data/blacklist.txt</span><br><span style="color: hsl(120, 100%, 40%);">+ grep -v "^#" /repo-install-test/blacklist_$DISTRO.txt | sort -u > blacklist.txt</span><br><span> </span><br><span> # Generate list of pkgs to be installed from available pkgs minus the ones blacklisted</span><br><span style="color: hsl(0, 100%, 40%);">- comm -23 /data/osmocom_packages_all.txt \</span><br><span style="color: hsl(0, 100%, 40%);">- /data/blacklist.txt > /data/osmocom_packages.txt</span><br><span style="color: hsl(120, 100%, 40%);">+ comm -23 osmocom_packages_all.txt \</span><br><span style="color: hsl(120, 100%, 40%);">+ blacklist.txt > osmocom_packages.txt</span><br><span> }</span><br><span> </span><br><span> install_repo_packages_debian() {</span><br><span>@@ -112,10 +112,10 @@</span><br><span> # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html</span><br><span> aptitude search -F%p \</span><br><span> "?origin($OBS) ?architecture(native)" | sort \</span><br><span style="color: hsl(0, 100%, 40%);">- > /data/osmocom_packages_all.txt</span><br><span style="color: hsl(120, 100%, 40%);">+ > osmocom_packages_all.txt</span><br><span> </span><br><span> filter_packages_txt</span><br><span style="color: hsl(0, 100%, 40%);">- apt install -y $(cat /data/osmocom_packages.txt)</span><br><span style="color: hsl(120, 100%, 40%);">+ apt install -y $(cat osmocom_packages.txt)</span><br><span> }</span><br><span> </span><br><span> install_repo_packages_centos() {</span><br><span>@@ -127,10 +127,10 @@</span><br><span> --repoid="network_osmocom_$FEED" \</span><br><span> --archlist="x86_64,noarch" \</span><br><span> --qf="%{name}" \</span><br><span style="color: hsl(0, 100%, 40%);">- > /data/osmocom_packages_all.txt</span><br><span style="color: hsl(120, 100%, 40%);">+ > osmocom_packages_all.txt</span><br><span> </span><br><span> filter_packages_txt</span><br><span style="color: hsl(0, 100%, 40%);">- dnf install -y $(cat /data/osmocom_packages.txt)</span><br><span style="color: hsl(120, 100%, 40%);">+ dnf install -y $(cat osmocom_packages.txt)</span><br><span> }</span><br><span> </span><br><span> test_binaries_version() {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/18518">change 18518</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/+/18518"/><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: If7e1d83580c2951e7e50181ba7e755b987675e4b </div>
<div style="display:none"> Gerrit-Change-Number: 18518 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>