41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From e422c6cf725240dea80e1c51ba21cae8ee6641c6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongtao <zhongtao17@huawei.com>
|
||
|
|
Date: Sat, 25 Nov 2023 18:21:56 +0800
|
||
|
|
Subject: [PATCH 36/64] modify create_network.sh for default runtime changed
|
||
|
|
|
||
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
||
|
|
---
|
||
|
|
CI/test_cases/container_cases/create_network.sh | 2 +-
|
||
|
|
CI/test_cases/helpers.sh | 2 ++
|
||
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/CI/test_cases/container_cases/create_network.sh b/CI/test_cases/container_cases/create_network.sh
|
||
|
|
index 470bda70..5bafbc60 100755
|
||
|
|
--- a/CI/test_cases/container_cases/create_network.sh
|
||
|
|
+++ b/CI/test_cases/container_cases/create_network.sh
|
||
|
|
@@ -37,7 +37,7 @@ function test_network_param()
|
||
|
|
|
||
|
|
msg_info "${test} starting..."
|
||
|
|
|
||
|
|
- root="`isula info | grep 'iSulad Root Dir' | awk -F ':' '{print $2}'`/engines/lcr"
|
||
|
|
+ root="`isula info | grep 'iSulad Root Dir' | awk -F ':' '{print $2}'`/engines/$DEFAULT_RUNTIME"
|
||
|
|
|
||
|
|
isula pull ${image}
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to pull image: ${image}" && return ${FAILURE}
|
||
|
|
diff --git a/CI/test_cases/helpers.sh b/CI/test_cases/helpers.sh
|
||
|
|
index f3eeb54d..c5eba8a2 100755
|
||
|
|
--- a/CI/test_cases/helpers.sh
|
||
|
|
+++ b/CI/test_cases/helpers.sh
|
||
|
|
@@ -29,6 +29,8 @@ ISULAD_RUN_ROOT_PATH="/var/run/isulad"
|
||
|
|
|
||
|
|
RUNTIME_LIST=(lcr runc)
|
||
|
|
|
||
|
|
+DEFAULT_RUNTIME=runc
|
||
|
|
+
|
||
|
|
testcase_data="/tmp/testcases_data"
|
||
|
|
|
||
|
|
enable_native_network=0
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|