提交 929dfca8 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!681 unified suffix name of script files in CI

Merge pull request !681 from Jackey_1024/my_CI
......@@ -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
......
......@@ -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
......
......@@ -20,7 +20,7 @@
curr_path=$(dirname $(readlink -f "$0"))
data_path=$(realpath $curr_path/../data)
source ../helpers.bash
source ../helpers.sh
connect="grpc"
......
......@@ -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()
{
......
......@@ -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
......
......@@ -19,7 +19,7 @@
##- @Create: 2020-03-30
#######################################################################
source ../helpers.bash
source ../helpers.sh
function do_test_t()
{
......
......@@ -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()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_events()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_image_export()
{
......
......@@ -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()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
image="busybox"
isula pull ${image}
......
......@@ -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()
{
......
......@@ -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)
......
......@@ -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)
......
......@@ -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}"
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_rename_spec()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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"
......
......@@ -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()
{
......
......@@ -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}"
......@@ -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()
{
......
......@@ -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()
......
......@@ -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}"
......@@ -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}"
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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()
{
......
......@@ -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"
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_image_info()
{
......
......@@ -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"
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_image_remove()
{
......
......@@ -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"
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_image_list()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function test_crictl_image()
{
......
......@@ -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()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
image="busybox"
......
......@@ -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()
{
......
......@@ -20,7 +20,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
do_test_t()
{
......
......@@ -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()
{
......
......@@ -37,7 +37,7 @@
#######################################################################
declare -r curr_path=$(dirname $(readlink -f "$0"))
source ../helpers.bash
source ../helpers.sh
function perpare_selinux_environment()
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册