osmocom
/
osmo-ci
mirror of https://gerrit.osmocom.org/osmo-ci
10
0
Fork 1
Code Releases Activity

repo-install-test: add SKIP_PREPARE_VM env var 

Change-Id: I96c7aef70d9d2c6318ce4e43c24450461bc00d91
changes/06/30506/2
Oliver Smith 2022-12-08 09:58:07 +01:00 committed by osmith
parent 048492d1c8
commit aae43b731f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/repo-install-test.sh
View File

@ -5,6 +5,7 @@
# * KEEP_VM: for development: don't kill/start VM if still running
# * PROJ: OBS project namespace (e.g. "osmocom:latest")
# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "osmocom:nightly")
# * SKIP_PREPARE_VM: for development, skip the prepare_vm code
# * TESTS: which tests to run (all by default, see below for possible values)
. "$(dirname "$0")/common.sh"
@ -138,6 +139,7 @@ qemu_run_test_script() {
export FEED="$FEED"
export PROJ="$PROJ"
export PROJ_CONFLICT="$PROJ_CONFLICT"
export SKIP_PREPARE_VM="$SKIP_PREPARE_VM"
export TESTS="$TESTS"
/repo-install-test/run-inside.sh

8
scripts/repo-install-test/run-inside.sh
View File

@ -5,6 +5,7 @@
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
# * PROJ: OBS project namespace (e.g. "osmocom:latest")
# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "osmocom:nightly")
# * SKIP_PREPARE_VM: for development, skip the prepare_vm code
# * TESTS: which tests to run (see repo-install-test.sh)
# Systemd services that must start up successfully after installing all packages (OS#3369)
@ -189,6 +190,10 @@ prepare_vm_centos() {
}
prepare_vm() {
if [ -n "$SKIP_PREPARE_VM" ]; then
return
fi
case "$DISTRO" in
debian*)
prepare_vm_debian
@ -197,6 +202,8 @@ prepare_vm() {
prepare_vm_centos
;;
esac
configure_osmocom_repo "$PROJ"
}
# $1: file
@ -416,7 +423,6 @@ services_check() {
check_env
prepare_vm
configure_osmocom_repo "$PROJ"
for test in $TESTS; do
set +x