From be8e1822b771576ef2f225da90dc6f0551477c0e Mon Sep 17 00:00:00 2001 From: zhongtao Date: Sat, 7 Sep 2024 14:49:33 +0800 Subject: [PATCH 134/149] change image digest ci test for registry change Signed-off-by: zhongtao --- CI/make-and-install.sh | 5 ++--- CI/test_cases/image_cases/image_digest.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CI/make-and-install.sh b/CI/make-and-install.sh index 2c2a4241..599afcb9 100755 --- a/CI/make-and-install.sh +++ b/CI/make-and-install.sh @@ -95,7 +95,7 @@ cmake -DLIB_INSTALL_DIR=${restbuilddir}/lib -DCMAKE_INSTALL_PREFIX=${restbuilddi make -j $(nproc) make install sed -i 's/"log-driver": "stdout"/"log-driver": "file"/g' ${restbuilddir}/etc/isulad/daemon.json -sed -i "/registry-mirrors/a\ \"https://hub.oepkgs.net\"" ${restbuilddir}/etc/isulad/daemon.json +sed -i "/registry-mirrors/a\ \"https://hub.oepkgs.net\",\\n \"https://docker.chenby.cn\"" ${builddir}/etc/isulad/daemon.json #build grpc version cd $ISULAD_COPY_PATH @@ -109,5 +109,4 @@ else fi make -j $(nproc) make install -sed -i 's/"log-driver": "stdout"/"log-driver": "file"/g' ${builddir}/etc/isulad/daemon.json -sed -i "/registry-mirrors/a\ \"https://hub.oepkgs.net\"" ${builddir}/etc/isulad/daemon.json +sed -i "/registry-mirrors/a\ \"https://hub.oepkgs.net\",\\n \"https://docker.chenby.cn\"" ${builddir}/etc/isulad/daemon.json diff --git a/CI/test_cases/image_cases/image_digest.sh b/CI/test_cases/image_cases/image_digest.sh index 20774e07..ec1cbaa5 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="ubuntu" local image_digest="hub.oepkgs.net/library/busybox@sha256:6066ca124f8c2686b7ae71aa1d6583b28c6dc3df3bdc386f2c89b92162c597d9" local test="pull && inspect && tag image with digest test => (${FUNCNAME[@]})" -- 2.25.1