diff --git a/CI/build.sh b/CI/build.sh index e9cb098ce971d7769d5b43996916c1778f89fd76..c2ff01173825eb069ff3363acab256ff70078767 100755 --- a/CI/build.sh +++ b/CI/build.sh @@ -88,7 +88,7 @@ declare -A scripts pwd TESTCASE_PATH="./CI/test_cases" -for file in $(find ${TESTCASE_PATH} -not \( -path '.*/data' -prune \) -not \( -path "${TESTCASE_PATH}/manual_cases" -prune \) -regextype posix-extended -regex ".*\.(bash)" | grep -v "helpers.bash" | sort) +for file in $(find ${TESTCASE_PATH} -not \( -path '.*/data' -prune \) -not \( -path "${TESTCASE_PATH}/manual_cases" -prune \) -regextype posix-extended -regex ".*\.(bash)" | grep -v "helpers.sh" | sort) do attributes=$(sed -n '3p' $file) if [[ "x$attributes" == "x" ]] || [[ ! "${attributes}" =~ "attributes:" ]];then diff --git a/CI/run-testcases.sh b/CI/run-testcases.sh index 205224ddd5333a4c6e2296f3d5c5bff7af83d6a2..21ce5aecdc199d1dd95de1374460a44bf1cec1d2 100755 --- a/CI/run-testcases.sh +++ b/CI/run-testcases.sh @@ -120,7 +120,7 @@ if [ $? -eq 0 ];then fi echo_success "===================RUN INTEGRATION START=========================" cd ./CI/test_cases -./ci_isula.bash -p isulad -l / +./ci_isula.sh -p isulad -l / if [[ $? -ne 0 ]]; then exit 1 fi diff --git a/CI/test_cases/ci_isula.bash b/CI/test_cases/ci_isula.sh similarity index 100% rename from CI/test_cases/ci_isula.bash rename to CI/test_cases/ci_isula.sh diff --git a/CI/test_cases/container_cases/check_fd_leakage_of_isulad.bash b/CI/test_cases/container_cases/check_fd_leakage_of_isulad.sh similarity index 99% rename from CI/test_cases/container_cases/check_fd_leakage_of_isulad.bash rename to CI/test_cases/container_cases/check_fd_leakage_of_isulad.sh index b66f03ea7699e287aa0d49c219e2a01c40336488..971b33d2f7336956de339ebcde84483c0a8d0378 100755 --- a/CI/test_cases/container_cases/check_fd_leakage_of_isulad.bash +++ b/CI/test_cases/container_cases/check_fd_leakage_of_isulad.sh @@ -20,7 +20,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh connect="grpc" diff --git a/CI/test_cases/container_cases/cni_test.bash b/CI/test_cases/container_cases/cni_test.sh similarity index 99% rename from CI/test_cases/container_cases/cni_test.bash rename to CI/test_cases/container_cases/cni_test.sh index 1f5e2274914347e7c4f73a826abf00d653553bce..115e03174f9559ae662f8b6d7e03c0df76f25be5 100644 --- a/CI/test_cases/container_cases/cni_test.bash +++ b/CI/test_cases/container_cases/cni_test.sh @@ -7,7 +7,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/criconfigs) pause_img_path=$(realpath $curr_path/test_data) -source ../helpers.bash +source ../helpers.sh function do_pre() { diff --git a/CI/test_cases/container_cases/cp.bash b/CI/test_cases/container_cases/cp.sh similarity index 99% rename from CI/test_cases/container_cases/cp.bash rename to CI/test_cases/container_cases/cp.sh index 7f78cd7a0289d2adc112b71bc988e576d0f5c1b0..dfbd222fac12c5ca68d937a1ff35bb830bab53f5 100644 --- a/CI/test_cases/container_cases/cp.bash +++ b/CI/test_cases/container_cases/cp.sh @@ -19,7 +19,7 @@ ##- @Create: 2020-06-03 ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh cpfiles=/tmp/subcmdcp diff --git a/CI/test_cases/container_cases/create.bash b/CI/test_cases/container_cases/create.sh similarity index 99% rename from CI/test_cases/container_cases/create.bash rename to CI/test_cases/container_cases/create.sh index 2a5af77c61ace36791ca45d557ee461c7ba04832..ac5ea3927a6e9c9058b3b1185d4cac6c74c24915 100755 --- a/CI/test_cases/container_cases/create.bash +++ b/CI/test_cases/container_cases/create.sh @@ -19,7 +19,7 @@ ##- @Create: 2020-03-30 ####################################################################### -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/create_mtab_test.bash b/CI/test_cases/container_cases/create_mtab_test.sh similarity index 98% rename from CI/test_cases/container_cases/create_mtab_test.bash rename to CI/test_cases/container_cases/create_mtab_test.sh index f079e45ee868da7f3b0174610ee70faaacfd4f07..8930e6b7fdfcb5f3095642444a4360951decb831 100755 --- a/CI/test_cases/container_cases/create_mtab_test.bash +++ b/CI/test_cases/container_cases/create_mtab_test.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/events.bash b/CI/test_cases/container_cases/events.sh similarity index 99% rename from CI/test_cases/container_cases/events.bash rename to CI/test_cases/container_cases/events.sh index 615ae0ca9073ba2792444166e6438c50d01db58e..36d01100c7fdcdecdeae530e90a49ce131f082e4 100755 --- a/CI/test_cases/container_cases/events.bash +++ b/CI/test_cases/container_cases/events.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_events() { diff --git a/CI/test_cases/container_cases/export.bash b/CI/test_cases/container_cases/export.sh similarity index 98% rename from CI/test_cases/container_cases/export.bash rename to CI/test_cases/container_cases/export.sh index 143be4c8fd7d47019dfdb39318973d2c639e66a0..9c128c6b5b6e4b93f7465746b989474ecc3f0e20 100755 --- a/CI/test_cases/container_cases/export.bash +++ b/CI/test_cases/container_cases/export.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_image_export() { diff --git a/CI/test_cases/container_cases/grow_fs.bash b/CI/test_cases/container_cases/grow_fs.sh similarity index 99% rename from CI/test_cases/container_cases/grow_fs.bash rename to CI/test_cases/container_cases/grow_fs.sh index d3641a2bf1de6bbc03c444ed83e181ed03f2442f..50fbe5e530b21b21bc3d744b75f1a31d5d58561b 100755 --- a/CI/test_cases/container_cases/grow_fs.bash +++ b/CI/test_cases/container_cases/grow_fs.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_pre() { diff --git a/CI/test_cases/container_cases/health_check.bash b/CI/test_cases/container_cases/health_check.sh similarity index 99% rename from CI/test_cases/container_cases/health_check.bash rename to CI/test_cases/container_cases/health_check.sh index 95db036008b7c980d6a4574001de3e4bd4e81ccc..eeb2749dc3357b0f2edf09e73ff089558524497d 100755 --- a/CI/test_cases/container_cases/health_check.bash +++ b/CI/test_cases/container_cases/health_check.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh image="busybox" isula pull ${image} diff --git a/CI/test_cases/container_cases/help.bash b/CI/test_cases/container_cases/help.sh similarity index 98% rename from CI/test_cases/container_cases/help.bash rename to CI/test_cases/container_cases/help.sh index 503596441c1113d3d64b7f012cc7682082cb4261..806b1c532ac80eff4140e35d9f50b2fa14a7273a 100755 --- a/CI/test_cases/container_cases/help.bash +++ b/CI/test_cases/container_cases/help.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function isulad_help() { diff --git a/CI/test_cases/container_cases/hook_ignore_poststart_error.bash b/CI/test_cases/container_cases/hook_ignore_poststart_error.sh similarity index 97% rename from CI/test_cases/container_cases/hook_ignore_poststart_error.bash rename to CI/test_cases/container_cases/hook_ignore_poststart_error.sh index 0d39ffefee6484851f151312316b0e07eb52c74c..6536d824dec8ab885092bf541588564d13943338 100644 --- a/CI/test_cases/container_cases/hook_ignore_poststart_error.bash +++ b/CI/test_cases/container_cases/hook_ignore_poststart_error.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh test_data_path=$(realpath $curr_path/test_data) diff --git a/CI/test_cases/container_cases/hook_spec_test.bash b/CI/test_cases/container_cases/hook_spec_test.sh similarity index 97% rename from CI/test_cases/container_cases/hook_spec_test.bash rename to CI/test_cases/container_cases/hook_spec_test.sh index c4fa397676280b99518333cfaf1b792798f480cd..828c3b829bd47bbf484adc1c4c0e7a190d7b37bc 100644 --- a/CI/test_cases/container_cases/hook_spec_test.bash +++ b/CI/test_cases/container_cases/hook_spec_test.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh test_data_path=$(realpath $curr_path/test_data) diff --git a/CI/test_cases/container_cases/inspect.bash b/CI/test_cases/container_cases/inspect.sh similarity index 99% rename from CI/test_cases/container_cases/inspect.bash rename to CI/test_cases/container_cases/inspect.sh index 6de82789f9021474cc023cafdafb8c0573698839..f196549d1d45828413492a4808a83912bd8e69f3 100644 --- a/CI/test_cases/container_cases/inspect.bash +++ b/CI/test_cases/container_cases/inspect.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh test_data_path=$(realpath $curr_path/test_data) function test_inspect_spec() @@ -146,4 +146,4 @@ declare -i ans=0 test_inspect_spec || ((ans++)) -show_result ${ans} "${curr_path}/${0}" \ No newline at end of file +show_result ${ans} "${curr_path}/${0}" diff --git a/CI/test_cases/container_cases/kill.bash b/CI/test_cases/container_cases/kill.sh similarity index 98% rename from CI/test_cases/container_cases/kill.bash rename to CI/test_cases/container_cases/kill.sh index f156c22601e9a92bc81e1d19d2b3cf5e237e042f..84769663a85001261c36ceda92604c99ead6a70e 100755 --- a/CI/test_cases/container_cases/kill.bash +++ b/CI/test_cases/container_cases/kill.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/pause.bash b/CI/test_cases/container_cases/pause.sh similarity index 98% rename from CI/test_cases/container_cases/pause.bash rename to CI/test_cases/container_cases/pause.sh index d5ac95e81a9d02388024f865c9c692681e3e4202..e2af3e9b83c7cad3b59d35765861503ba3ff7d9d 100755 --- a/CI/test_cases/container_cases/pause.bash +++ b/CI/test_cases/container_cases/pause.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/ps.bash b/CI/test_cases/container_cases/ps.sh similarity index 99% rename from CI/test_cases/container_cases/ps.bash rename to CI/test_cases/container_cases/ps.sh index def0a2e76bf6873dd1707d9a6b0646e91779572b..d46cc6d4edb6c8d998e6791b42c23e8d8e0d377e 100755 --- a/CI/test_cases/container_cases/ps.bash +++ b/CI/test_cases/container_cases/ps.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/rename.bash b/CI/test_cases/container_cases/rename.sh similarity index 98% rename from CI/test_cases/container_cases/rename.bash rename to CI/test_cases/container_cases/rename.sh index cedc4022550fdf6d8477fb821aaec02d57039ba2..91d49518f2cc486f6c7939eceddc60f0690c0698 100644 --- a/CI/test_cases/container_cases/rename.bash +++ b/CI/test_cases/container_cases/rename.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_rename_spec() { diff --git a/CI/test_cases/container_cases/restart.bash b/CI/test_cases/container_cases/restart.sh similarity index 98% rename from CI/test_cases/container_cases/restart.bash rename to CI/test_cases/container_cases/restart.sh index 3d21d07d7231b6db79a9f391681e390305211367..d40c76fa034b5f7a72a2c5c60796ea1d6893b033 100755 --- a/CI/test_cases/container_cases/restart.bash +++ b/CI/test_cases/container_cases/restart.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/restartpolicy.bash b/CI/test_cases/container_cases/restartpolicy.sh similarity index 98% rename from CI/test_cases/container_cases/restartpolicy.bash rename to CI/test_cases/container_cases/restartpolicy.sh index 7c86894ef65b2a8f8fe98d1f32dc4bbd5e69d421..be0140e72cc42a9f9be6dbf0cfeed69d7fe9817f 100755 --- a/CI/test_cases/container_cases/restartpolicy.bash +++ b/CI/test_cases/container_cases/restartpolicy.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_on_failure() { diff --git a/CI/test_cases/container_cases/resume.bash b/CI/test_cases/container_cases/resume.sh similarity index 98% rename from CI/test_cases/container_cases/resume.bash rename to CI/test_cases/container_cases/resume.sh index 792b39c753c7fcb0c76f34f0d7c61dec2804335c..c9a621f5ecc5cf70985d13a7582bc6d58d1fc2ec 100755 --- a/CI/test_cases/container_cases/resume.bash +++ b/CI/test_cases/container_cases/resume.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/rm.bash b/CI/test_cases/container_cases/rm.sh similarity index 99% rename from CI/test_cases/container_cases/rm.bash rename to CI/test_cases/container_cases/rm.sh index 98c58aef44fd044cc72df43fe4e9c34a47f3e05c..45877097e621d0f11969fa289cca0b7f734fc3ae 100755 --- a/CI/test_cases/container_cases/rm.bash +++ b/CI/test_cases/container_cases/rm.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function rm_stopped_container() { diff --git a/CI/test_cases/container_cases/run.bash b/CI/test_cases/container_cases/run.sh similarity index 99% rename from CI/test_cases/container_cases/run.bash rename to CI/test_cases/container_cases/run.sh index 79ea04942a324c61392f227b977dbdecdec7f88f..85f6e55d62ee681109b51825f9036c23d6489332 100755 --- a/CI/test_cases/container_cases/run.bash +++ b/CI/test_cases/container_cases/run.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/share_ns_test.bash b/CI/test_cases/container_cases/share_ns_test.sh similarity index 98% rename from CI/test_cases/container_cases/share_ns_test.bash rename to CI/test_cases/container_cases/share_ns_test.sh index 4fceedc209c938a99af6677aadadcf612e195108..c902136eda7adcfc266a6f3e8db6d219f83fbe25 100755 --- a/CI/test_cases/container_cases/share_ns_test.bash +++ b/CI/test_cases/container_cases/share_ns_test.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh arr_ns_type[0]="--ipc" arr_ns_type[1]="--pid" arr_ns_type[2]="--net" diff --git a/CI/test_cases/container_cases/start.bash b/CI/test_cases/container_cases/start.sh similarity index 98% rename from CI/test_cases/container_cases/start.bash rename to CI/test_cases/container_cases/start.sh index 9031f2328e81ffca043d50fdfcab156851b23dab..1e9be829bf6605da1052b8aa46c5ce7bd02cb871 100755 --- a/CI/test_cases/container_cases/start.bash +++ b/CI/test_cases/container_cases/start.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/stats.bash b/CI/test_cases/container_cases/stats.sh similarity index 99% rename from CI/test_cases/container_cases/stats.bash rename to CI/test_cases/container_cases/stats.sh index 8437b212ecb0d14bf4979fb04f05dc936951291c..7389ee439be6fb3c462602877fc5e58aa9d33ea9 100644 --- a/CI/test_cases/container_cases/stats.bash +++ b/CI/test_cases/container_cases/stats.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_stats_spec() { @@ -131,4 +131,4 @@ declare -i ans=0 test_stats_spec || ((ans++)) -show_result ${ans} "${curr_path}/${0}" \ No newline at end of file +show_result ${ans} "${curr_path}/${0}" diff --git a/CI/test_cases/container_cases/stop.bash b/CI/test_cases/container_cases/stop.sh similarity index 98% rename from CI/test_cases/container_cases/stop.bash rename to CI/test_cases/container_cases/stop.sh index 0296a2f8e5a04efeb965a46e38818481809b769a..69582c370d6273618007ee3467a4d67592b38626 100755 --- a/CI/test_cases/container_cases/stop.bash +++ b/CI/test_cases/container_cases/stop.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/storage_opts_dm.bash b/CI/test_cases/container_cases/storage_opts_dm.sh similarity index 99% rename from CI/test_cases/container_cases/storage_opts_dm.bash rename to CI/test_cases/container_cases/storage_opts_dm.sh index aa2b3d2eca2de0d3e076ee928e22323390730068..705eaad753a9cb0c12723a08a2383b803215c621 100755 --- a/CI/test_cases/container_cases/storage_opts_dm.bash +++ b/CI/test_cases/container_cases/storage_opts_dm.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh image_busybox="busybox" function reinstall_thinpool() diff --git a/CI/test_cases/container_cases/storage_size.bash b/CI/test_cases/container_cases/storage_size.sh similarity index 97% rename from CI/test_cases/container_cases/storage_size.bash rename to CI/test_cases/container_cases/storage_size.sh index 8f4be34bdbb23f390ff774ea45dd0ddf02485ed5..b8a8f4592cb55239ff8079031e68fc93cd1e710e 100755 --- a/CI/test_cases/container_cases/storage_size.bash +++ b/CI/test_cases/container_cases/storage_size.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh opt_size_basesize=10 opt_size_lower=9 opt_size_upper=11 @@ -64,4 +64,4 @@ if [[ $storage_driver == "devicemapper" ]]; then test_devmapper_size || ((ans++)) fi -show_result ${ans} "${curr_path}/${0}" \ No newline at end of file +show_result ${ans} "${curr_path}/${0}" diff --git a/CI/test_cases/container_cases/top.bash b/CI/test_cases/container_cases/top.sh similarity index 96% rename from CI/test_cases/container_cases/top.bash rename to CI/test_cases/container_cases/top.sh index 6226811953832c43d32989677f05b6b4bb3fb52a..49c4515cb5dcc895aafc3bb095888350b6813b41 100644 --- a/CI/test_cases/container_cases/top.bash +++ b/CI/test_cases/container_cases/top.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_top_spec() { @@ -53,4 +53,4 @@ declare -i ans=0 test_top_spec || ((ans++)) -show_result ${ans} "${curr_path}/${0}" \ No newline at end of file +show_result ${ans} "${curr_path}/${0}" diff --git a/CI/test_cases/container_cases/ulimit.bash b/CI/test_cases/container_cases/ulimit.sh similarity index 99% rename from CI/test_cases/container_cases/ulimit.bash rename to CI/test_cases/container_cases/ulimit.sh index 9640cb9811ef65149c891cce22bbe8c97c2f91dc..81e11b32b2683a7f5d102d9dc771537f2779c1dd 100644 --- a/CI/test_cases/container_cases/ulimit.bash +++ b/CI/test_cases/container_cases/ulimit.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function test_ulimit() { diff --git a/CI/test_cases/container_cases/update.bash b/CI/test_cases/container_cases/update.sh similarity index 99% rename from CI/test_cases/container_cases/update.bash rename to CI/test_cases/container_cases/update.sh index 1cf913b19742a0ac3596c735c330889dd92fea75..0045d7503dc5190dd7902edab189e3a4f3629fa0 100755 --- a/CI/test_cases/container_cases/update.bash +++ b/CI/test_cases/container_cases/update.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function do_test_t() { diff --git a/CI/test_cases/container_cases/version.bash b/CI/test_cases/container_cases/version.sh similarity index 99% rename from CI/test_cases/container_cases/version.bash rename to CI/test_cases/container_cases/version.sh index 941b4dc46bb1a1d5681d6c17506f442e36d07528..f794cbc1509f969d12edcaa4ee9b171e59639af9 100755 --- a/CI/test_cases/container_cases/version.bash +++ b/CI/test_cases/container_cases/version.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function isulad_version() { diff --git a/CI/test_cases/helpers.bash b/CI/test_cases/helpers.sh similarity index 100% rename from CI/test_cases/helpers.bash rename to CI/test_cases/helpers.sh diff --git a/CI/test_cases/image_cases/help.bash b/CI/test_cases/image_cases/help.sh similarity index 98% rename from CI/test_cases/image_cases/help.bash rename to CI/test_cases/image_cases/help.sh index 503596441c1113d3d64b7f012cc7682082cb4261..806b1c532ac80eff4140e35d9f50b2fa14a7273a 100755 --- a/CI/test_cases/image_cases/help.bash +++ b/CI/test_cases/image_cases/help.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function isulad_help() { diff --git a/CI/test_cases/image_cases/image_import.bash b/CI/test_cases/image_cases/image_import.sh similarity index 99% rename from CI/test_cases/image_cases/image_import.bash rename to CI/test_cases/image_cases/image_import.sh index 6ad4627f114446ab19589a4439179df50d1fff4b..0159d1f6418127d48efc2a82ed072e5c90973c07 100755 --- a/CI/test_cases/image_cases/image_import.bash +++ b/CI/test_cases/image_cases/image_import.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh rootfs_tar="${curr_path}/rootfs.tar" rootfs_tar_xz="${curr_path}/rootfs.tar.xz" rootfs_empty_gz="${curr_path}/empty.gz" diff --git a/CI/test_cases/image_cases/image_inspect.bash b/CI/test_cases/image_cases/image_inspect.sh similarity index 99% rename from CI/test_cases/image_cases/image_inspect.bash rename to CI/test_cases/image_cases/image_inspect.sh index 42ecae6bb13f329902f89a72b312753ba501504b..309f06078dc33a698ff951bbe906d311d6b99478 100755 --- a/CI/test_cases/image_cases/image_inspect.bash +++ b/CI/test_cases/image_cases/image_inspect.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_image_info() { diff --git a/CI/test_cases/image_cases/image_load.bash b/CI/test_cases/image_cases/image_load.sh similarity index 99% rename from CI/test_cases/image_cases/image_load.bash rename to CI/test_cases/image_cases/image_load.sh index a033bf6d4e0448855e709782e5563c21dc73e615..8415e0367ef7ebb258acc5d7181b0f300f6df2f0 100755 --- a/CI/test_cases/image_cases/image_load.bash +++ b/CI/test_cases/image_cases/image_load.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh single_image="${curr_path}/busybox.tar" mult_image="${curr_path}/mult_image.tar" diff --git a/CI/test_cases/image_cases/image_remove.bash b/CI/test_cases/image_cases/image_remove.sh similarity index 99% rename from CI/test_cases/image_cases/image_remove.bash rename to CI/test_cases/image_cases/image_remove.sh index 8b279c6c43bc3c7438e713d833becc7ef25062eb..474e7bd35785dc6bfdbf8cab3ede510824f72eb7 100755 --- a/CI/test_cases/image_cases/image_remove.bash +++ b/CI/test_cases/image_cases/image_remove.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_image_remove() { diff --git a/CI/test_cases/image_cases/image_tag.bash b/CI/test_cases/image_cases/image_tag.sh similarity index 99% rename from CI/test_cases/image_cases/image_tag.bash rename to CI/test_cases/image_cases/image_tag.sh index 893565cb3cc07bb8370cd3ef0ab1c748e62a8aa0..ab04560f2ecd495d72868707e1ed74ab12a40acb 100755 --- a/CI/test_cases/image_cases/image_tag.bash +++ b/CI/test_cases/image_cases/image_tag.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh image_busybox="busybox" image_hello="hello-world" diff --git a/CI/test_cases/image_cases/images_list.bash b/CI/test_cases/image_cases/images_list.sh similarity index 99% rename from CI/test_cases/image_cases/images_list.bash rename to CI/test_cases/image_cases/images_list.sh index 51c7a1aadc50e7bf02de33571bbd46bb204b469e..ebfd1df07e55759d23c551cbb0e51b8d2f84f228 100755 --- a/CI/test_cases/image_cases/images_list.bash +++ b/CI/test_cases/image_cases/images_list.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_image_list() { diff --git a/CI/test_cases/image_cases/img_fs_info.bash b/CI/test_cases/image_cases/img_fs_info.sh similarity index 98% rename from CI/test_cases/image_cases/img_fs_info.bash rename to CI/test_cases/image_cases/img_fs_info.sh index 6399253e82c468586b53223e7036aafdbedf12c7..f6c9a194686a65e689bed4a2019626f6b7ea1d9c 100755 --- a/CI/test_cases/image_cases/img_fs_info.bash +++ b/CI/test_cases/image_cases/img_fs_info.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function test_crictl_image() { diff --git a/CI/test_cases/image_cases/img_status.bash b/CI/test_cases/image_cases/img_status.sh similarity index 99% rename from CI/test_cases/image_cases/img_status.bash rename to CI/test_cases/image_cases/img_status.sh index d415afff69306ff0e8aa00f2333163359172023f..c4ed208ef7567aac9ed705ba283aa7a867ce2709 100755 --- a/CI/test_cases/image_cases/img_status.bash +++ b/CI/test_cases/image_cases/img_status.sh @@ -22,7 +22,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) driver="overlay2" -source ../helpers.bash +source ../helpers.sh function pre_test() { diff --git a/CI/test_cases/image_cases/integration_check.bash b/CI/test_cases/image_cases/integration_check.sh similarity index 99% rename from CI/test_cases/image_cases/integration_check.bash rename to CI/test_cases/image_cases/integration_check.sh index ed7ae8394abd4084dfc0af13dedac4bb9da8af82..2e6f962ebec46486eaa8cd63a8fcb955e760adbe 100755 --- a/CI/test_cases/image_cases/integration_check.bash +++ b/CI/test_cases/image_cases/integration_check.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh image="busybox" diff --git a/CI/test_cases/image_cases/registry.bash b/CI/test_cases/image_cases/registry.sh similarity index 99% rename from CI/test_cases/image_cases/registry.bash rename to CI/test_cases/image_cases/registry.sh index 368b6fae3807edcbb05b3d084eab82b166fea307..7507d225a5d15d5b4567b0772b1330de6e99b4ae 100755 --- a/CI/test_cases/image_cases/registry.bash +++ b/CI/test_cases/image_cases/registry.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function isula_pull() { diff --git a/CI/test_cases/image_cases/storage_metdata.bash b/CI/test_cases/image_cases/storage_metdata.sh similarity index 98% rename from CI/test_cases/image_cases/storage_metdata.bash rename to CI/test_cases/image_cases/storage_metdata.sh index f17d4c744d82b7972677283ca88221ac5cb026d0..178f79b3bc3bcc97ffaeb04e5426d0954a384409 100755 --- a/CI/test_cases/image_cases/storage_metdata.bash +++ b/CI/test_cases/image_cases/storage_metdata.sh @@ -20,7 +20,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh do_test_t() { diff --git a/CI/test_cases/image_cases/version.bash b/CI/test_cases/image_cases/version.sh similarity index 99% rename from CI/test_cases/image_cases/version.bash rename to CI/test_cases/image_cases/version.sh index 6216c5d1fbcb47ae78e39f659fed50d556d5da6c..73f3b5fac84c21ff99bdaa063eb5a543a69da8bd 100755 --- a/CI/test_cases/image_cases/version.bash +++ b/CI/test_cases/image_cases/version.sh @@ -21,7 +21,7 @@ curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/../data) -source ../helpers.bash +source ../helpers.sh function isulad_version() { diff --git a/CI/test_cases/manual_cases/security_selinux.bash b/CI/test_cases/manual_cases/security_selinux.sh similarity index 99% rename from CI/test_cases/manual_cases/security_selinux.bash rename to CI/test_cases/manual_cases/security_selinux.sh index 7560d986fb8f829bcbd1199157eb9b8aecfc7359..e8e164e03e07f08b04a0116000fe79577b93dc0f 100755 --- a/CI/test_cases/manual_cases/security_selinux.bash +++ b/CI/test_cases/manual_cases/security_selinux.sh @@ -37,7 +37,7 @@ ####################################################################### declare -r curr_path=$(dirname $(readlink -f "$0")) -source ../helpers.bash +source ../helpers.sh function perpare_selinux_environment() {