<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22329">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">repo-install-test: make HTTP, OBS vars local<br><br>Move the two debian-specific variables to the debian-related functions<br>where they are used. Both are only used once, and having them global is<br>misleading since the test isn't just for debian anymore, but also for<br>centos8.<br><br>Make the variables lowercase to indicate that they aren't used globally.<br><br>Related: OS#4733<br>Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8<br>---<br>M scripts/repo-install-test/run-inside-docker.sh<br>1 file changed, 6 insertions(+), 5 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/29/22329/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 f472645..3c3245d 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>@@ -45,9 +45,6 @@</span><br><span>      echo "$1" | tr : _</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-HTTP="http://download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/Debian_9.0/"</span><br><span style="color: hsl(0, 100%, 40%);">-OBS="obs://build.opensuse.org/$PROJ/Debian_9.0"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> check_env() {</span><br><span>         if [ -n "$FEED" ]; then</span><br><span>            echo "Checking feed: $FEED"</span><br><span>@@ -70,8 +67,10 @@</span><br><span> }</span><br><span> </span><br><span> configure_osmocom_repo_debian() {</span><br><span style="color: hsl(120, 100%, 40%);">+      local http="http://download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        echo "Configuring Osmocom repository"</span><br><span style="color: hsl(0, 100%, 40%);">- echo "deb $HTTP ./" \</span><br><span style="color: hsl(120, 100%, 40%);">+       echo "deb $http ./" \</span><br><span>              > /etc/apt/sources.list.d/osmocom-latest.list</span><br><span>     apt-get update</span><br><span> }</span><br><span>@@ -125,12 +124,14 @@</span><br><span> }</span><br><span> </span><br><span> install_repo_packages_debian() {</span><br><span style="color: hsl(120, 100%, 40%);">+      local obs="obs://build.opensuse.org/$PROJ/Debian_9.0"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    echo "Installing all repository packages"</span><br><span> </span><br><span>      # Get a list of all packages from the repository. Reference:</span><br><span>         # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html</span><br><span>     aptitude search -F%p \</span><br><span style="color: hsl(0, 100%, 40%);">-          "?origin($OBS) ?architecture(native)" | sort \</span><br><span style="color: hsl(120, 100%, 40%);">+              "?origin($obs) ?architecture(native)" | sort \</span><br><span>             > osmocom_packages_all.txt</span><br><span> </span><br><span>    filter_packages_txt</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22329">change 22329</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/+/22329"/><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: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8 </div>
<div style="display:none"> Gerrit-Change-Number: 22329 </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>