<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22374">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: no distro version in function<br><br>Instead of calling various foo_debian and foo_centos8 versions with<br>foo_$DISTRO, create new foo functions that call the right<br>distro-specific function based on debian* or centos* being in DISTRO.<br>Rename all foo_centos8 functions to foo_centos.<br><br>This is in preparation to run this script with debian10 too, not just<br>debian9. This can also be used to test a different centos version in the<br>future.<br><br>Related: OS#4969<br>Change-Id: Ibb9f93af16af7ebe947f7efcd4e709f3e62d12c0<br>---<br>M scripts/repo-install-test/run-inside-docker.sh<br>1 file changed, 60 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 dddad30..2e9d6a8 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>@@ -105,7 +105,7 @@</span><br><span> }</span><br><span> </span><br><span> # $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span style="color: hsl(0, 100%, 40%);">-configure_osmocom_repo_centos8() {</span><br><span style="color: hsl(120, 100%, 40%);">+configure_osmocom_repo_centos() {</span><br><span> local proj="$1"</span><br><span> local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$proj")/CentOS_8"</span><br><span> </span><br><span>@@ -124,16 +124,24 @@</span><br><span> }</span><br><span> </span><br><span> # $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span style="color: hsl(0, 100%, 40%);">-configure_osmocom_repo_centos8_remove() {</span><br><span style="color: hsl(120, 100%, 40%);">+configure_osmocom_repo_centos_remove() {</span><br><span> local proj="$1"</span><br><span> rm "/etc/yum.repos.d/$proj.repo"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-configure_keep_cache_debian() {</span><br><span style="color: hsl(0, 100%, 40%);">- if [ -z "$KEEP_CACHE" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- return</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+configure_osmocom_repo() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$DISTRO" in</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*)</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_osmocom_repo_debian "$@"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*)</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_osmocom_repo_centos "$@"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+configure_keep_cache_debian() {</span><br><span> rm /etc/apt/apt.conf.d/docker-clean</span><br><span> </span><br><span> # "apt" will actually remove the cache by default, even if "apt-get" keeps it.</span><br><span>@@ -142,11 +150,23 @@</span><br><span> > /etc/apt/apt.conf.d/01keep-debs</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-configure_keep_cache_centos8() {</span><br><span style="color: hsl(120, 100%, 40%);">+configure_keep_cache_centos() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "keepcache=1" >> /etc/dnf/dnf.conf</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+configure_keep_cache() {</span><br><span> if [ -z "$KEEP_CACHE" ]; then</span><br><span> return</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">- echo "keepcache=1" >> /etc/dnf/dnf.conf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$DISTRO" in</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*)</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_keep_cache_debian</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*)</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_keep_cache_centos</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> }</span><br><span> </span><br><span> # $1: file</span><br><span>@@ -190,11 +210,11 @@</span><br><span> configure_osmocom_repo_debian "$PROJ"</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-test_conflict_centos8() {</span><br><span style="color: hsl(120, 100%, 40%);">+test_conflict_centos() {</span><br><span> dnf -y install libosmocore-devel</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- configure_osmocom_repo_centos8_remove "$PROJ"</span><br><span style="color: hsl(0, 100%, 40%);">- configure_osmocom_repo_centos8 "$PROJ_CONFLICT"</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_osmocom_repo_centos_remove "$PROJ"</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_osmocom_repo_centos "$PROJ_CONFLICT"</span><br><span> </span><br><span> (dnf -y install osmo-mgw 2>&1 && touch /tmp/fail) | tee /tmp/out</span><br><span> </span><br><span>@@ -209,8 +229,19 @@</span><br><span> "but none of the providers can be installed" \</span><br><span> "conflicts with osmocom-"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- configure_osmocom_repo_centos8_remove "$PROJ_CONFLICT"</span><br><span style="color: hsl(0, 100%, 40%);">- configure_osmocom_repo_centos8 "$PROJ"</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_osmocom_repo_centos_remove "$PROJ_CONFLICT"</span><br><span style="color: hsl(120, 100%, 40%);">+ configure_osmocom_repo_centos "$PROJ"</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test_conflict() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$DISTRO" in</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*)</span><br><span style="color: hsl(120, 100%, 40%);">+ test_conflict_debian</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*)</span><br><span style="color: hsl(120, 100%, 40%);">+ test_conflict_centos</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span> }</span><br><span> </span><br><span> # Filter $PWD/osmocom_packages_all.txt through a blacklist_$DISTRO.txt and store the result in</span><br><span>@@ -239,7 +270,7 @@</span><br><span> apt install -y $(cat osmocom_packages.txt)</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-install_repo_packages_centos8() {</span><br><span style="color: hsl(120, 100%, 40%);">+install_repo_packages_centos() {</span><br><span> echo "Installing all repository packages"</span><br><span> </span><br><span> # Get a list of all packages from the repository</span><br><span>@@ -254,6 +285,17 @@</span><br><span> dnf install -y $(cat osmocom_packages.txt)</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+install_repo_packages() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$DISTRO" in</span><br><span style="color: hsl(120, 100%, 40%);">+ debian*)</span><br><span style="color: hsl(120, 100%, 40%);">+ install_repo_packages_debian</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ centos*)</span><br><span style="color: hsl(120, 100%, 40%);">+ install_repo_packages_centos</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> test_binaries_version() {</span><br><span> # Make sure --version runs and does not output UNKNOWN</span><br><span> failed=""</span><br><span>@@ -331,8 +373,8 @@</span><br><span> }</span><br><span> </span><br><span> check_env</span><br><span style="color: hsl(0, 100%, 40%);">-configure_keep_cache_${DISTRO}</span><br><span style="color: hsl(0, 100%, 40%);">-configure_osmocom_repo_${DISTRO} "$PROJ"</span><br><span style="color: hsl(120, 100%, 40%);">+configure_keep_cache</span><br><span style="color: hsl(120, 100%, 40%);">+configure_osmocom_repo "$PROJ"</span><br><span> </span><br><span> for test in $TESTS; do</span><br><span> set +x</span><br><span>@@ -343,10 +385,10 @@</span><br><span> </span><br><span> case "$test" in</span><br><span> test_conflict)</span><br><span style="color: hsl(0, 100%, 40%);">- test_conflict_${DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+ test_conflict</span><br><span> ;;</span><br><span> install_repo_packages)</span><br><span style="color: hsl(0, 100%, 40%);">- install_repo_packages_${DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+ install_repo_packages</span><br><span> ;;</span><br><span> test_binaries)</span><br><span> # install_repo_packages must run first!</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22374">change 22374</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/+/22374"/><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: Ibb9f93af16af7ebe947f7efcd4e709f3e62d12c0 </div>
<div style="display:none"> Gerrit-Change-Number: 22374 </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-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>