From a26602e9bf7fb8de4f0ed0b4b706fdfeebf706bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A6=E7=A7=AF=E8=B6=85?= Date: Wed, 18 Sep 2024 10:39:43 +0800 Subject: [PATCH 225/226] Synchronize changes from the master branch to the stable branch. --- CI/test_cases/container_cases/exec_additional_gids.sh | 3 ++- CI/test_cases/container_cases/exec_runc.sh | 2 +- CI/test_cases/image_cases/image_digest.sh | 2 +- CI/test_cases/image_cases/image_tag.sh | 2 +- CI/test_cases/image_cases/images_list.sh | 2 +- CI/test_cases/image_cases/integration_check.sh | 4 ++-- CI/test_cases/manual_cases/security_selinux.sh | 6 +++--- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CI/test_cases/container_cases/exec_additional_gids.sh b/CI/test_cases/container_cases/exec_additional_gids.sh index f24678d3..82297902 100755 --- a/CI/test_cases/container_cases/exec_additional_gids.sh +++ b/CI/test_cases/container_cases/exec_additional_gids.sh @@ -26,7 +26,8 @@ test="exec additional gids test => test_exec_additional_gids" test_log=$(mktemp /tmp/additional_gids_test_XXX) USERNAME="user" -USER_UID="1000" +# Do not use 1000 as the test gid because "ubuntu:x:1000:" already exists in the ubuntu image +USER_UID="1002" USER_GID="$USER_UID" ADDITIONAL_GID="1001" ADDITIONAL_GROUP="additional" diff --git a/CI/test_cases/container_cases/exec_runc.sh b/CI/test_cases/container_cases/exec_runc.sh index f963724e..16dfaef6 100755 --- a/CI/test_cases/container_cases/exec_runc.sh +++ b/CI/test_cases/container_cases/exec_runc.sh @@ -26,7 +26,7 @@ test="exec_runc_test => (${FUNCNAME[@]})" function exec_runc_test() { local ret=0 - local image="ubuntu" + local image="isulad/ubuntu" local container_name="test_busybox" isula pull ${image} diff --git a/CI/test_cases/image_cases/image_digest.sh b/CI/test_cases/image_cases/image_digest.sh index 20774e07..5036239a 100755 --- a/CI/test_cases/image_cases/image_digest.sh +++ b/CI/test_cases/image_cases/image_digest.sh @@ -26,7 +26,7 @@ function test_image_with_digest() { local ret=0 local image="hub.oepkgs.net/library/busybox" - local image2="hub.oepkgs.net/library/ubuntu" + local image2="isulad/ubuntu" local image_digest="hub.oepkgs.net/library/busybox@sha256:6066ca124f8c2686b7ae71aa1d6583b28c6dc3df3bdc386f2c89b92162c597d9" local test="pull && inspect && tag image with digest test => (${FUNCNAME[@]})" diff --git a/CI/test_cases/image_cases/image_tag.sh b/CI/test_cases/image_cases/image_tag.sh index 551d8249..0b8dd3e8 100755 --- a/CI/test_cases/image_cases/image_tag.sh +++ b/CI/test_cases/image_cases/image_tag.sh @@ -23,7 +23,7 @@ declare -r curr_path=$(dirname $(readlink -f "$0")) source ../helpers.sh image_busybox="busybox" -image_hello="hello-world" +image_hello="isulad/hello-world" function test_tag_image() { diff --git a/CI/test_cases/image_cases/images_list.sh b/CI/test_cases/image_cases/images_list.sh index 56cde5b6..a192a75c 100755 --- a/CI/test_cases/image_cases/images_list.sh +++ b/CI/test_cases/image_cases/images_list.sh @@ -25,7 +25,7 @@ source ../helpers.sh function test_image_list() { local ret=0 - local image="hello-world" + local image="isulad/hello-world" local image_busybox="busybox" local INVALID_IMAGE="k~k" local test="list images info test => (${FUNCNAME[@]})" diff --git a/CI/test_cases/image_cases/integration_check.sh b/CI/test_cases/image_cases/integration_check.sh index 52468760..463da17f 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="nats" + local uimage="isulad/nats" local test="list && inspect image info test => (${FUNCNAME[@]})" local lid local cid @@ -55,7 +55,7 @@ function test_image_info() ucid=$(isula create ${uimage}) [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - create container failed" && ((ret++)) - isula run -tid --name checker alpine + isula run -tid --name checker isulad/alpine [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - run container failed" && ((ret++)) tmp_fname=$(echo -n "/var/run/isulad/storage" | sha256sum | awk '{print $1}') diff --git a/CI/test_cases/manual_cases/security_selinux.sh b/CI/test_cases/manual_cases/security_selinux.sh index c558befe..cf94c809 100755 --- a/CI/test_cases/manual_cases/security_selinux.sh +++ b/CI/test_cases/manual_cases/security_selinux.sh @@ -87,7 +87,7 @@ function daemon_disable_selinux() function test_isulad_selinux_file_label() { local ret=0 - local image="centos" + local image="isulad/centos" local test="isulad selinux file label test => (${FUNCNAME[@]})" msg_info "${test} starting..." @@ -144,7 +144,7 @@ function test_isulad_selinux_file_label() function test_isulad_selinux_process_label() { local ret=0 - local image="centos" + local image="isulad/centos" local test="isulad selinux process label test => (${FUNCNAME[@]})" msg_info "${test} starting..." @@ -172,7 +172,7 @@ function test_isulad_selinux_process_label() function test_isulad_selinux_mount_mode() { local ret=0 - local image="centos" + local image="isulad/centos" local test="isulad selinux mount mode test => (${FUNCNAME[@]})" msg_info "${test} starting..." -- 2.33.0