<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22376">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: resolve distro obs dir in func<br><br>Instead of hardcoding CentOS_8 in the centos code path, and Debian_9.0<br>in the debian code path, resolve the proper OBS directory based on<br>$DISTRO.<br><br>Related: OS#4969<br>Change-Id: Ie537e8befeebd7958b2a1fe8f6fd54587cfcb1b6<br>---<br>M scripts/repo-install-test/run-inside-docker.sh<br>1 file changed, 20 insertions(+), 3 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 2e9d6a8..355b668 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>@@ -37,6 +37,23 @@</span><br><span> osmo-bts-virtual</span><br><span> "</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+distro_obsdir() {</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$DISTRO" in</span><br><span style="color: hsl(120, 100%, 40%);">+ centos8)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "CentOS_8"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ debian)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Debian_9.0"</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%);">+ echo "ERROR: unknown obsdir for '$DISTRO'." >&2</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</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 style="color: hsl(120, 100%, 40%);">+DISTRO_OBSDIR="$(distro_obsdir)"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # $1: OBS project (e.g. "network:osmocom:nightly" -> "network:/osmocom:/nightly")</span><br><span> proj_with_slashes() {</span><br><span> echo "$1" | sed "s.:.:/.g"</span><br><span>@@ -82,7 +99,7 @@</span><br><span> # $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span> configure_osmocom_repo_debian() {</span><br><span> local proj="$1"</span><br><span style="color: hsl(0, 100%, 40%);">- local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes "$proj")/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/"</span><br><span> local release_key="/var/cache/apt/${proj}_Release.key"</span><br><span> </span><br><span> echo "Configuring Osmocom repository"</span><br><span>@@ -107,7 +124,7 @@</span><br><span> # $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span> configure_osmocom_repo_centos() {</span><br><span> local proj="$1"</span><br><span style="color: hsl(0, 100%, 40%);">- local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$proj")/CentOS_8"</span><br><span style="color: hsl(120, 100%, 40%);">+ local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR"</span><br><span> </span><br><span> echo "Configuring Osmocom repository"</span><br><span> # Generate this file, based on the feed:</span><br><span>@@ -256,7 +273,7 @@</span><br><span> }</span><br><span> </span><br><span> install_repo_packages_debian() {</span><br><span style="color: hsl(0, 100%, 40%);">- local obs="obs://build.opensuse.org/$PROJ/Debian_9.0"</span><br><span style="color: hsl(120, 100%, 40%);">+ local obs="obs://build.opensuse.org/$PROJ/$DISTRO_OBSDIR"</span><br><span> </span><br><span> echo "Installing all repository packages"</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22376">change 22376</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/+/22376"/><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: Ie537e8befeebd7958b2a1fe8f6fd54587cfcb1b6 </div>
<div style="display:none"> Gerrit-Change-Number: 22376 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>