osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31312 ) Change subject: repo-install-test: add DOMAIN variable ...................................................................... repo-install-test: add DOMAIN variable Allow overriding the downloads.osmocom.org domain of the url where packages are downloaded from, so we can download them from people.osmocom.org instead while developing / debugging, e.g.: https://people.osmocom.org/packages/home:/osmith:/nightly/ Change-Id: I36bc0eae9fdee75512c1dbdca84cd6224b8c192a --- M scripts/repo-install-test.sh M scripts/repo-install-test/run-inside.sh 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/12/31312/1 diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index 38f1a6b..676354a 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -1,5 +1,6 @@ #!/bin/sh -ex # Environment variables: +# * DOMAIN: default is downloads.osmocom.org, set to people.osmocom.org for testing pkgs from home:… # * FEED: binary package feed (e.g. "latest", "nightly") # * INTERACTIVE: set to 1 to keep an interactive shell open after the script ran (for debugging) # * KEEP_VM: for development: don't kill/start VM if still running @@ -9,6 +10,7 @@ # * TESTS: which tests to run (all by default, see below for possible values) . "$(dirname "$0")/common.sh" +DOMAIN="${DOMAIN:-downloads.osmocom.org}" DISTRO="$1" DISTROS=" centos8 @@ -136,6 +138,7 @@ #!/bin/sh -ex export DISTRO="$DISTRO" + export DOMAIN="$DOMAIN" export FEED="$FEED" export PROJ="$PROJ" export PROJ_CONFLICT="$PROJ_CONFLICT" diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index d959cc0..6fcc391 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -108,7 +108,7 @@ # $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_debian() { local proj="$1" - local obs_repo="downloads.osmocom.org/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" + local obs_repo="$DOMAIN/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" echo "Configuring Osmocom repository" @@ -132,7 +132,7 @@ # $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_centos() { local proj="$1" - local baseurl="https://downloads.osmocom.org/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR" + local baseurl="https://$DOMAIN/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR" echo "Configuring Osmocom repository" # Generate this file, based on the feed: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36bc0eae9fdee75512c1dbdca84cd6224b8c192a Gerrit-Change-Number: 31312 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange