From 5a30c52fd5f03e11a1e7a998731c59a31477eba9 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Mon, 16 Oct 2023 08:21:17 +0000 Subject: automatic import of iSulad --- 0003-2158-Use-crictl-v1.22.0-for-ci.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 0003-2158-Use-crictl-v1.22.0-for-ci.patch (limited to '0003-2158-Use-crictl-v1.22.0-for-ci.patch') diff --git a/0003-2158-Use-crictl-v1.22.0-for-ci.patch b/0003-2158-Use-crictl-v1.22.0-for-ci.patch new file mode 100644 index 0000000..9b5d1b4 --- /dev/null +++ b/0003-2158-Use-crictl-v1.22.0-for-ci.patch @@ -0,0 +1,26 @@ +From 384940dee7ed5bcc01014520b94917f5782f996e Mon Sep 17 00:00:00 2001 +From: xuxuepeng +Date: Wed, 30 Aug 2023 03:36:45 +0000 +Subject: [PATCH 03/33] !2158 Use crictl v1.22.0 for ci * Use crictl v1.22.0 + for ci + +--- + CI/install_depends.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CI/install_depends.sh b/CI/install_depends.sh +index ff919afe..bff825a8 100755 +--- a/CI/install_depends.sh ++++ b/CI/install_depends.sh +@@ -46,7 +46,7 @@ function make_crictl() + cd cri-tools + # crictl v1.18 cannot recognise the SecurityProfile seccomp of LinuxSandboxSecurityContext + # and the LinuxContainerSecurityContext.has_seccomp() always false +- git checkout v1.24.2 ++ git checkout v1.22.0 + make -j $nproc + echo "make cri-tools: $?" + cp ./build/bin/crictl ${builddir}/bin/ +-- +2.40.1 + -- cgit v1.2.3