Change in osmo-ci[master]: repo-install-test: make HTTP, OBS vars local

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Wed Jan 20 15:33:12 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22329 )

Change subject: repo-install-test: make HTTP, OBS vars local
......................................................................

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
---
M scripts/repo-install-test/run-inside-docker.sh
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  osmith: Verified



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 @@
 	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 @@
 }
 
 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 @@
 }
 
 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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22329
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I1dfddbd9311d741c03ceedb12aee9aeae6abdab8
Gerrit-Change-Number: 22329
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210120/d965c1a0/attachment.htm>


More information about the gerrit-log mailing list