mirror of https://gerrit.osmocom.org/osmo-ci
repo-install-test: add SKIP_PREPARE_VM env var
Change-Id: I96c7aef70d9d2c6318ce4e43c24450461bc00d91
This commit is contained in:
parent
048492d1c8
commit
aae43b731f
|
@ -5,6 +5,7 @@
|
||||||
# * KEEP_VM: for development: don't kill/start VM if still running
|
# * KEEP_VM: for development: don't kill/start VM if still running
|
||||||
# * PROJ: OBS project namespace (e.g. "osmocom:latest")
|
# * PROJ: OBS project namespace (e.g. "osmocom:latest")
|
||||||
# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "osmocom:nightly")
|
# * 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)
|
# * TESTS: which tests to run (all by default, see below for possible values)
|
||||||
. "$(dirname "$0")/common.sh"
|
. "$(dirname "$0")/common.sh"
|
||||||
|
|
||||||
|
@ -138,6 +139,7 @@ qemu_run_test_script() {
|
||||||
export FEED="$FEED"
|
export FEED="$FEED"
|
||||||
export PROJ="$PROJ"
|
export PROJ="$PROJ"
|
||||||
export PROJ_CONFLICT="$PROJ_CONFLICT"
|
export PROJ_CONFLICT="$PROJ_CONFLICT"
|
||||||
|
export SKIP_PREPARE_VM="$SKIP_PREPARE_VM"
|
||||||
export TESTS="$TESTS"
|
export TESTS="$TESTS"
|
||||||
|
|
||||||
/repo-install-test/run-inside.sh
|
/repo-install-test/run-inside.sh
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
|
# * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development)
|
||||||
# * PROJ: OBS project namespace (e.g. "osmocom:latest")
|
# * PROJ: OBS project namespace (e.g. "osmocom:latest")
|
||||||
# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "osmocom:nightly")
|
# * 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)
|
# * TESTS: which tests to run (see repo-install-test.sh)
|
||||||
|
|
||||||
# Systemd services that must start up successfully after installing all packages (OS#3369)
|
# Systemd services that must start up successfully after installing all packages (OS#3369)
|
||||||
|
@ -189,6 +190,10 @@ prepare_vm_centos() {
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare_vm() {
|
prepare_vm() {
|
||||||
|
if [ -n "$SKIP_PREPARE_VM" ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
case "$DISTRO" in
|
case "$DISTRO" in
|
||||||
debian*)
|
debian*)
|
||||||
prepare_vm_debian
|
prepare_vm_debian
|
||||||
|
@ -197,6 +202,8 @@ prepare_vm() {
|
||||||
prepare_vm_centos
|
prepare_vm_centos
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
configure_osmocom_repo "$PROJ"
|
||||||
}
|
}
|
||||||
|
|
||||||
# $1: file
|
# $1: file
|
||||||
|
@ -416,7 +423,6 @@ services_check() {
|
||||||
|
|
||||||
check_env
|
check_env
|
||||||
prepare_vm
|
prepare_vm
|
||||||
configure_osmocom_repo "$PROJ"
|
|
||||||
|
|
||||||
for test in $TESTS; do
|
for test in $TESTS; do
|
||||||
set +x
|
set +x
|
||||||
|
|
Loading…
Reference in New Issue