From 2ff368cad4218aa5eeb4fe133141a74c409cfff0 Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Mon, 29 Jun 2020 10:42:20 +0800 Subject: [PATCH] CI: rebase master at 6.29 Signed-off-by: lifeng68 --- CI/test_cases/container_cases/cni_test.bash | 2 +- CI/test_cases/container_cases/create.bash | 2 +- CI/test_cases/container_cases/create_mtab_test.bash | 2 +- CI/test_cases/container_cases/export.bash | 2 +- CI/test_cases/container_cases/kill.bash | 2 +- CI/test_cases/container_cases/restart.bash | 2 +- CI/test_cases/container_cases/restartpolicy.bash | 2 +- CI/test_cases/container_cases/run.bash | 2 +- CI/test_cases/container_cases/share_ns_test.bash | 2 +- CI/test_cases/container_cases/stop.bash | 2 +- CI/test_cases/container_cases/update.bash | 4 ++-- CI/test_cases/image_cases/image_import.bash | 2 +- CI/test_cases/image_cases/image_inspect.bash | 2 +- CI/test_cases/image_cases/image_load.bash | 2 +- CI/test_cases/image_cases/image_remove.bash | 2 +- CI/test_cases/image_cases/images_list.bash | 2 +- CI/test_cases/image_cases/registry.bash | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CI/test_cases/container_cases/cni_test.bash b/CI/test_cases/container_cases/cni_test.bash index 1f5e227..3910778 100644 --- a/CI/test_cases/container_cases/cni_test.bash +++ b/CI/test_cases/container_cases/cni_test.bash @@ -2,7 +2,7 @@ # # attributes: isulad cri cni # concurrent: NA -# spend time: 46 +# spend time: 45 curr_path=$(dirname $(readlink -f "$0")) data_path=$(realpath $curr_path/criconfigs) diff --git a/CI/test_cases/container_cases/create.bash b/CI/test_cases/container_cases/create.bash index 14290ed..f9fca3b 100755 --- a/CI/test_cases/container_cases/create.bash +++ b/CI/test_cases/container_cases/create.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance create # concurrent: YES -# spend time: 5 +# spend time: 4 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/create_mtab_test.bash b/CI/test_cases/container_cases/create_mtab_test.bash index f079e45..d90d059 100755 --- a/CI/test_cases/container_cases/create_mtab_test.bash +++ b/CI/test_cases/container_cases/create_mtab_test.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance start # concurrent: YES -# spend time: 2 +# spend time: 1 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/export.bash b/CI/test_cases/container_cases/export.bash index 864b2d4..ec5078c 100755 --- a/CI/test_cases/container_cases/export.bash +++ b/CI/test_cases/container_cases/export.bash @@ -2,7 +2,7 @@ # # attributes: isulad basic export container # concurrent: NA -# spend time: 8 +# spend time: 5 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/kill.bash b/CI/test_cases/container_cases/kill.bash index 4205756..d09a48b 100755 --- a/CI/test_cases/container_cases/kill.bash +++ b/CI/test_cases/container_cases/kill.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance kill # concurrent: YES -# spend time: 12 +# spend time: 9 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/restart.bash b/CI/test_cases/container_cases/restart.bash index acacda6..677dc35 100755 --- a/CI/test_cases/container_cases/restart.bash +++ b/CI/test_cases/container_cases/restart.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance restart # concurrent: YES -# spend time: 31 +# spend time: 33 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/restartpolicy.bash b/CI/test_cases/container_cases/restartpolicy.bash index 6224413..0333e4f 100755 --- a/CI/test_cases/container_cases/restartpolicy.bash +++ b/CI/test_cases/container_cases/restartpolicy.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance restartpolicy # concurrent: NO -# spend time: 23 +# spend time: 24 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/run.bash b/CI/test_cases/container_cases/run.bash index 163c804..79ea049 100755 --- a/CI/test_cases/container_cases/run.bash +++ b/CI/test_cases/container_cases/run.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance run # concurrent: YES -# spend time: 3 +# spend time: 4 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/share_ns_test.bash b/CI/test_cases/container_cases/share_ns_test.bash index 669a474..e9b6c7b 100755 --- a/CI/test_cases/container_cases/share_ns_test.bash +++ b/CI/test_cases/container_cases/share_ns_test.bash @@ -2,7 +2,7 @@ # # attributes: isulad share namepaces # concurrent: NO -# spend time: 24 +# spend time: 25 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/stop.bash b/CI/test_cases/container_cases/stop.bash index 8b416b2..4eb8dd5 100755 --- a/CI/test_cases/container_cases/stop.bash +++ b/CI/test_cases/container_cases/stop.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance stop # concurrent: YES -# spend time: 23 +# spend time: 28 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/container_cases/update.bash b/CI/test_cases/container_cases/update.bash index 0c50b0a..1cf913b 100755 --- a/CI/test_cases/container_cases/update.bash +++ b/CI/test_cases/container_cases/update.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance update # concurrent: YES -# spend time: 15 +# spend time: 16 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. @@ -26,7 +26,7 @@ source ../helpers.bash function do_test_t() { containername=test_update - containerid=`isula create -t --memory 50M --name $containername busybox` + containerid=`isula create -t --name $containername busybox` fn_check_eq "$?" "0" "create failed" testcontainer $containername inited diff --git a/CI/test_cases/image_cases/image_import.bash b/CI/test_cases/image_cases/image_import.bash index 447a3bb..975cc6f 100755 --- a/CI/test_cases/image_cases/image_import.bash +++ b/CI/test_cases/image_cases/image_import.bash @@ -2,7 +2,7 @@ # # attributes: isulad basic image # concurrent: NA -# spend time: 2 +# spend time: 4 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/image_cases/image_inspect.bash b/CI/test_cases/image_cases/image_inspect.bash index fede140..42ecae6 100755 --- a/CI/test_cases/image_cases/image_inspect.bash +++ b/CI/test_cases/image_cases/image_inspect.bash @@ -2,7 +2,7 @@ # # attributes: isulad basic image list ps inspect # concurrent: NA -# spend time: 5 +# spend time: 4 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/image_cases/image_load.bash b/CI/test_cases/image_cases/image_load.bash index 77f22a8..61a8fd8 100755 --- a/CI/test_cases/image_cases/image_load.bash +++ b/CI/test_cases/image_cases/image_load.bash @@ -2,7 +2,7 @@ # # attributes: isulad basic image # concurrent: NA -# spend time: 2 +# spend time: 18 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/image_cases/image_remove.bash b/CI/test_cases/image_cases/image_remove.bash index 3562ff5..f1d6035 100755 --- a/CI/test_cases/image_cases/image_remove.bash +++ b/CI/test_cases/image_cases/image_remove.bash @@ -2,7 +2,7 @@ # # attributes: isulad basic remove image # concurrent: NA -# spend time: 10 +# spend time: 8 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/image_cases/images_list.bash b/CI/test_cases/image_cases/images_list.bash index 5790201..cfdfaa4 100755 --- a/CI/test_cases/image_cases/images_list.bash +++ b/CI/test_cases/image_cases/images_list.bash @@ -2,7 +2,7 @@ # # attributes: isulad basic image # concurrent: NA -# spend time: 7 +# spend time: 6 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. diff --git a/CI/test_cases/image_cases/registry.bash b/CI/test_cases/image_cases/registry.bash index 04d9929..71df80e 100755 --- a/CI/test_cases/image_cases/registry.bash +++ b/CI/test_cases/image_cases/registry.bash @@ -2,7 +2,7 @@ # # attributes: isulad inheritance version # concurrent: YES -# spend time: 12 +# spend time: 7 ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2020. All rights reserved. -- GitLab