<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/18513">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: add KEEP_CACHE env var<br><br>Keep downloaded binary packages to make test cycles shorter during<br>development. While at it, also document all environment variables.<br><br>Change-Id: I4d6ebaf460e47f29e023acb0bd78ef52ca80c7cd<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, 30 insertions(+), 0 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/13/18513/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index d6be3b5..78e48b5 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -11,6 +11,7 @@</span><br><span> _release_tarballs/</span><br><span> _docker_playground</span><br><span> _repo_install_test_data/</span><br><span style="color: hsl(120, 100%, 40%);">+_repo_install_test_cache/</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 0a19b04..e0367ec 100755</span><br><span>--- a/scripts/repo-install-test.sh</span><br><span>+++ b/scripts/repo-install-test.sh</span><br><span>@@ -1,4 +1,8 @@</span><br><span> #!/bin/sh -ex</span><br><span style="color: hsl(120, 100%, 40%);">+# Environment variables:</span><br><span style="color: hsl(120, 100%, 40%);">+# * INTERACTIVE: set to 1 to keep an interactive shell open after the script ran (for debugging)</span><br><span style="color: hsl(120, 100%, 40%);">+# * FEED: binary package feed (e.g. "latest", "nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)</span><br><span> . "$(dirname "$0")/common.sh"</span><br><span> docker_images_require "debian-repo-install-test"</span><br><span> </span><br><span>@@ -25,6 +29,13 @@</span><br><span> sleep 1</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Additional docker run arguments</span><br><span style="color: hsl(120, 100%, 40%);">+args=""</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -n "$KEEP_CACHE" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ args="$args -e KEEP_CACHE=1"</span><br><span style="color: hsl(120, 100%, 40%);">+ args="$args -v $OSMO_CI_DIR/_repo_install_test_cache/debian/apt:/var/cache/apt"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Run the container</span><br><span> # * This does not output anything, for debugging add -it and remove &.</span><br><span> # * /run, /tmp, cgroups, SYS_ADMIN: needed for systemd</span><br><span>@@ -41,6 +52,7 @@</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(120, 100%, 40%);">+ $args \</span><br><span> "$USER/debian-repo-install-test" \</span><br><span> /lib/systemd/systemd &</span><br><span> check_if_systemd_is_running</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 135d2d6..eed33d2 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>@@ -1,4 +1,7 @@</span><br><span> #!/bin/sh -ex</span><br><span style="color: hsl(120, 100%, 40%);">+# Environment variables:</span><br><span style="color: hsl(120, 100%, 40%);">+# * FEED: binary package feed (e.g. "latest", "nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)</span><br><span> </span><br><span> # Systemd services that must start up successfully after installing all packages (OS#3369)</span><br><span> # Disabled services:</span><br><span>@@ -49,6 +52,19 @@</span><br><span> apt-get update</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+configure_keep_cache() {</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -z "$KEEP_CACHE" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /etc/apt/apt.conf.d/docker-clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # "apt" will actually remove the cache by default, even if "apt-get" keeps it.</span><br><span style="color: hsl(120, 100%, 40%);">+ # https://unix.stackexchange.com/a/447607</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Binary::apt::APT::Keep-Downloaded-Packages "true";" \</span><br><span style="color: hsl(120, 100%, 40%);">+ > /etc/apt/apt.conf.d/01keep-debs</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_repo_packages() {</span><br><span> echo "Installing all repository packages"</span><br><span> </span><br><span>@@ -140,6 +156,7 @@</span><br><span> }</span><br><span> </span><br><span> check_env</span><br><span style="color: hsl(120, 100%, 40%);">+configure_keep_cache</span><br><span> configure_osmocom_repo</span><br><span> install_repo_packages</span><br><span> test_binaries</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/18513">change 18513</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/+/18513"/><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: I4d6ebaf460e47f29e023acb0bd78ef52ca80c7cd </div>
<div style="display:none"> Gerrit-Change-Number: 18513 </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>