<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22333">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: cfg_osmocom_repo: add PROJ arg<br><br>Prepare for future conflicts test, which will configure repositories<br>with a different PROJ.<br><br>Related: OS#4733<br>Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9<br>---<br>M scripts/repo-install-test/run-inside-docker.sh<br>1 file changed, 12 insertions(+), 8 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/33/22333/1</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 652fcd1..b10c97d 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>@@ -66,12 +66,14 @@</span><br><span>      fi</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span> configure_osmocom_repo_debian() {</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(0, 100%, 40%);">-        local release_key="/var/cache/apt/${PROJ}_Release.key"</span><br><span style="color: hsl(120, 100%, 40%);">+      local proj="$1"</span><br><span style="color: hsl(120, 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 release_key="/var/cache/apt/${proj}_Release.key"</span><br><span> </span><br><span>         echo "Configuring Osmocom repository"</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$PROJ.list"</span><br><span style="color: hsl(120, 100%, 40%);">+  echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list"</span><br><span> </span><br><span>     # Add repository key</span><br><span>         if ! [ -e "$release_key" ]; then</span><br><span>@@ -83,15 +85,17 @@</span><br><span>     apt-get update</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# $1: OBS project (e.g. "network:osmocom:nightly")</span><br><span> configure_osmocom_repo_centos8() {</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 proj="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+     local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$proj")/CentOS_8"</span><br><span> </span><br><span>     echo "Configuring Osmocom repository"</span><br><span>      # Generate this file, based on the feed:</span><br><span>     # https://download.opensuse.org/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo</span><br><span style="color: hsl(0, 100%, 40%);">-        cat << EOF > "/etc/yum.repos.d/$PROJ.repo"</span><br><span style="color: hsl(0, 100%, 40%);">-[$(proj_with_underscore "$PROJ")]</span><br><span style="color: hsl(0, 100%, 40%);">-name=$PROJ</span><br><span style="color: hsl(120, 100%, 40%);">+    cat << EOF > "/etc/yum.repos.d/$proj.repo"</span><br><span style="color: hsl(120, 100%, 40%);">+[$(proj_with_underscore "$proj")]</span><br><span style="color: hsl(120, 100%, 40%);">+name=$proj</span><br><span> type=rpm-md</span><br><span> baseurl=$baseurl/</span><br><span> gpgcheck=1</span><br><span>@@ -239,7 +243,7 @@</span><br><span> </span><br><span> check_env</span><br><span> configure_keep_cache_${DISTRO}</span><br><span style="color: hsl(0, 100%, 40%);">-configure_osmocom_repo_${DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+configure_osmocom_repo_${DISTRO} "$PROJ"</span><br><span> install_repo_packages_${DISTRO}</span><br><span> test_binaries</span><br><span> services_check</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22333">change 22333</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/+/22333"/><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: Ib9946b5a02f8692efc8515907ba84048026474f9 </div>
<div style="display:none"> Gerrit-Change-Number: 22333 </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>