Change in osmo-ci[master]: repo-install-test: cfg_osmocom_repo: add PROJ arg

[osmith]

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

Change subject: repo-install-test: cfg_osmocom_repo: add PROJ arg
......................................................................

repo-install-test: cfg_osmocom_repo: add PROJ arg

Prepare for future conflicts test, which will configure repositories
with a different PROJ.

Related: OS#4733
Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9
---
M scripts/repo-install-test/run-inside-docker.sh
1 file changed, 12 insertions(+), 8 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 652fcd1..b10c97d 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -66,12 +66,14 @@
 	fi
 }
 
+# $1: OBS project (e.g. "network:osmocom:nightly")
 configure_osmocom_repo_debian() {
-	local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/Debian_9.0/"
-	local release_key="/var/cache/apt/${PROJ}_Release.key"
+	local proj="$1"
+	local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes "$proj")/Debian_9.0/"
+	local release_key="/var/cache/apt/${proj}_Release.key"
 
 	echo "Configuring Osmocom repository"
-	echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$PROJ.list"
+	echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list"
 
 	# Add repository key
 	if ! [ -e "$release_key" ]; then
@@ -83,15 +85,17 @@
 	apt-get update
 }
 
+# $1: OBS project (e.g. "network:osmocom:nightly")
 configure_osmocom_repo_centos8() {
-	local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$PROJ")/CentOS_8"
+	local proj="$1"
+	local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$proj")/CentOS_8"
 
 	echo "Configuring Osmocom repository"
 	# Generate this file, based on the feed:
 	# https://download.opensuse.org/repositories/network:osmocom:latest/CentOS_8/network:osmocom:latest.repo
-	cat << EOF > "/etc/yum.repos.d/$PROJ.repo"
-[$(proj_with_underscore "$PROJ")]
-name=$PROJ
+	cat << EOF > "/etc/yum.repos.d/$proj.repo"
+[$(proj_with_underscore "$proj")]
+name=$proj
 type=rpm-md
 baseurl=$baseurl/
 gpgcheck=1
@@ -239,7 +243,7 @@
 
 check_env
 configure_keep_cache_${DISTRO}
-configure_osmocom_repo_${DISTRO}
+configure_osmocom_repo_${DISTRO} "$PROJ"
 install_repo_packages_${DISTRO}
 test_binaries
 services_check

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib9946b5a02f8692efc8515907ba84048026474f9
Gerrit-Change-Number: 22333
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/68052782/attachment.htm>