51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From d796113df9573d123a147709dbdb8df66277c1d2 Mon Sep 17 00:00:00 2001
|
|
From: gaohuatao <gaohuatao@huawei.com>
|
|
Date: Wed, 1 Jul 2020 14:13:03 +0800
|
|
Subject: [PATCH 07/12] add -d/--disk param for CI
|
|
|
|
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
|
|
---
|
|
CI/build.sh | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CI/build.sh b/CI/build.sh
|
|
index fddde51..c599991 100755
|
|
--- a/CI/build.sh
|
|
+++ b/CI/build.sh
|
|
@@ -34,6 +34,7 @@ LXC_LOCK_DIR_HOST="/tmp/lxc_mount_dir"
|
|
KEEP_CONTAINERS_ALIVE_DIR="/tmp/containerslock"
|
|
TESTCASE_ASSIGN="${CIDIR}/testcase_assign"
|
|
BASE_IMAGE=""
|
|
+disk=NULL
|
|
|
|
rm -rf ${TESTCASE_ASSIGN}_*
|
|
|
|
@@ -52,6 +53,7 @@ function usage() {
|
|
echo " -n, --container-num Multiple containers execute scripts in parallel"
|
|
echo " -g, --enable-gcov Enable gcov for code coverage analysis"
|
|
echo " -i, --ignore-ci Not running testcase"
|
|
+ echo " -d, --disk Specify the disk to create isulad-thinpool"
|
|
echo " --rm Auto remove containers after testcase run success"
|
|
echo " -h, --help Script help information"
|
|
}
|
|
@@ -60,7 +62,7 @@ function err() {
|
|
echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $@" >&2
|
|
}
|
|
|
|
-args=`getopt -o m:n:g:i:h --long module:,container-num:,enable-gcov:,ignore-ci:,help -- "$@"`
|
|
+args=`getopt -o m:n:g:i:d:h --long module:,container-num:,enable-gcov:,ignore-ci:,disk:,help -- "$@"`
|
|
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
|
|
eval set -- "$args"
|
|
|
|
@@ -70,6 +72,7 @@ while true; do
|
|
-n|--container-num) container_nums=${2} ; shift 2 ;;
|
|
-g|--enable-gcov) enable_gcov=${2} ; shift 2 ;;
|
|
-i|--ignore-ci) ignore_ci=${2} ; shift 2 ;;
|
|
+ -d|--disk) disk=${2} ; shift 2 ;;
|
|
-h|--help) usage ; exit 0 ;;
|
|
--) shift ; break ;;
|
|
*) err "invalid parameter" ; exit -1 ;;
|
|
--
|
|
2.20.1
|
|
|