diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-01-14 14:04:39 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-01-20 14:19:07 +0100 |
| commit | 12e68891258f95c6f9265b57ea69181fe0860b89 (patch) | |
| tree | 3403500cf8d121f8ad23534048d98a8ef9f1404a | |
| parent | 5ddc64b2924a880e30a7f06ed0ead0b9037df5ce (diff) | |
repo-install-test: make HTTP, OBS vars local
Move the two debian-specific variables to the debian-related functions
where they are used. Both are only used once, and having them global is
misleading since the test isn't just for debian anymore, but also for
centos8.
Make the variables lowercase to indicate that they aren't used globally.
Related: OS#4733
Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8
| -rwxr-xr-x | scripts/repo-install-test/run-inside-docker.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index f472645..3c3245d 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -45,9 +45,6 @@ proj_with_underscore() { echo "$1" | tr : _ } -HTTP="http://download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/Debian_9.0/" -OBS="obs://build.opensuse.org/$PROJ/Debian_9.0" - check_env() { if [ -n "$FEED" ]; then echo "Checking feed: $FEED" @@ -70,8 +67,10 @@ check_env() { } configure_osmocom_repo_debian() { + local http="http://download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/Debian_9.0/" + echo "Configuring Osmocom repository" - echo "deb $HTTP ./" \ + echo "deb $http ./" \ > /etc/apt/sources.list.d/osmocom-latest.list apt-get update } @@ -125,12 +124,14 @@ filter_packages_txt() { } install_repo_packages_debian() { + local obs="obs://build.opensuse.org/$PROJ/Debian_9.0" + echo "Installing all repository packages" # Get a list of all packages from the repository. Reference: # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html aptitude search -F%p \ - "?origin($OBS) ?architecture(native)" | sort \ + "?origin($obs) ?architecture(native)" | sort \ > osmocom_packages_all.txt filter_packages_txt |