58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From de06ee3e09f816bb17315289c696601af8fed4b8 Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Tue, 11 Jun 2024 17:14:58 +0800
|
|
Subject: [PATCH 214/226] skip test rely on docker.io
|
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
|
---
|
|
CI/test_cases/container_cases/test_data/daemon.json | 2 +-
|
|
CI/test_cases/image_cases/integration_check.sh | 2 +-
|
|
CI/test_cases/image_cases/registry.sh | 5 +++--
|
|
3 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/CI/test_cases/container_cases/test_data/daemon.json b/CI/test_cases/container_cases/test_data/daemon.json
|
|
index 2664c6b2..ab7d0360 100644
|
|
--- a/CI/test_cases/container_cases/test_data/daemon.json
|
|
+++ b/CI/test_cases/container_cases/test_data/daemon.json
|
|
@@ -24,7 +24,7 @@
|
|
"overlay2.override_kernel_check=true"
|
|
],
|
|
"registry-mirrors": [
|
|
- "docker.io"
|
|
+ "https://3laho3y3.mirror.aliyuncs.com"
|
|
],
|
|
"insecure-registries": [
|
|
],
|
|
diff --git a/CI/test_cases/image_cases/integration_check.sh b/CI/test_cases/image_cases/integration_check.sh
|
|
index e43369e3..52468760 100755
|
|
--- a/CI/test_cases/image_cases/integration_check.sh
|
|
+++ b/CI/test_cases/image_cases/integration_check.sh
|
|
@@ -27,7 +27,7 @@ image="busybox"
|
|
function test_image_info()
|
|
{
|
|
local ret=0
|
|
- local uimage="docker.io/library/nats"
|
|
+ local uimage="nats"
|
|
local test="list && inspect image info test => (${FUNCNAME[@]})"
|
|
local lid
|
|
local cid
|
|
diff --git a/CI/test_cases/image_cases/registry.sh b/CI/test_cases/image_cases/registry.sh
|
|
index 9ef22377..3db3f2c1 100755
|
|
--- a/CI/test_cases/image_cases/registry.sh
|
|
+++ b/CI/test_cases/image_cases/registry.sh
|
|
@@ -77,8 +77,9 @@ function isula_pull()
|
|
isula pull hub.c.163.com/public/centos:6.7-tools
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - --pull hub.c.163.com/public/centos:6.7-tools failed" && ((ret++))
|
|
|
|
- isula pull docker.io/library/busybox:latest
|
|
- [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - --pull docker.io/library/busybox:latest failed" && ((ret++))
|
|
+ # Unable to pull image from docker.io without agent, skip this test
|
|
+ # isula pull docker.io/library/busybox:latest
|
|
+ # [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - --pull docker.io/library/busybox:latest failed" && ((ret++))
|
|
|
|
isula pull 3laho3y3.mirror.aliyuncs.com/library/busybox
|
|
fn_check_eq "$?" "0" "isula pull 3laho3y3.mirror.aliyuncs.com/library/busybox"
|
|
--
|
|
2.33.0
|
|
|