From e3d7b1c451d57f6d4584d03fd8ea791d59886e26 Mon Sep 17 00:00:00 2001
From: root <root@ctadevjulien.cern.ch>
Date: Thu, 23 Nov 2017 12:06:35 +0100
Subject: [PATCH] Forwarding -b and -B options to `create_instance.sh` so that
we can run the buildtree test directly like this: ``` ./run_systemtest.sh -n
toto -s tests/archive_retrieve.sh -O -D -k -b /buildtree -B CTA-build ```
This will be very helpful to test buildtree in CI automatically.
---
.../orchestration/run_systemtest.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/continuousintegration/orchestration/run_systemtest.sh b/continuousintegration/orchestration/run_systemtest.sh
index 6fb5ddc159..c042f3e113 100755
--- a/continuousintegration/orchestration/run_systemtest.sh
+++ b/continuousintegration/orchestration/run_systemtest.sh
@@ -22,13 +22,17 @@ SYSTEMTEST_TIMEOUT=3600
die() { echo "$@" 1>&2 ; exit 1; }
usage() { cat <<EOF 1>&2
-Usage: $0 -n <namespace> -s <systemtest_script> [-p <gitlab pipeline ID>] [-t <systemtest timeout in seconds>] [-k] [-O] [-D]
+Usage: $0 -n <namespace> -s <systemtest_script> [-p <gitlab pipeline ID> | -b <build tree base> -B <build tree subdir> ] [-t <systemtest timeout in seconds>] [-k] [-O] [-D]
Options:
+ -b The directory containing both the source and the build tree for CTA. It will be mounted RO in the
+ containers.
+ -B The subdirectory within the -b directory where the build tree is.
-k keep namespace after systemtest_script run if successful
-O use Ceph account associated to this node (wipe content before tests), by default use local VFS
-D use Oracle account associated to this node (wipe content before tests), by default use local sqlite DB
+
Create a kubernetes instance and launch the system test script specified.
Makes sure the created instance is cleaned up at the end and return the status of the system test.
EOF
@@ -40,7 +44,7 @@ exit 1
# always delete DB and OBJECTSTORE for tests
CREATE_OPTS="-D -O"
-while getopts "n:s:p:t:kDO" o; do
+while getopts "n:s:p:b:B:t:kDO" o; do
case "${o}" in
s)
systemtest_script=${OPTARG}
@@ -52,6 +56,12 @@ while getopts "n:s:p:t:kDO" o; do
p)
CREATE_OPTS="${CREATE_OPTS} -p ${OPTARG}"
;;
+ b)
+ CREATE_OPTS="${CREATE_OPTS} -b ${OPTARG}"
+ ;;
+ B)
+ CREATE_OPTS="${CREATE_OPTS} -B ${OPTARG}"
+ ;;
t)
SYSTEMTEST_TIMEOUT=${OPTARG}
;;
--
GitLab