From 8ec74c5fa190f7b9cffd59fe97844669d7561bee Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Fri, 29 Sep 2023 16:27:49 -0400 Subject: [PATCH] contrib/test: pin the latest release of runc Fixes https://github.com/cri-o/cri-o/issues/7337 Let's pin the latest release until the issue related to SELinux for runc gets relsoved. Signed-off-by: Sohan Kunkerkar --- contrib/test/ci/build/runc.yml | 2 +- contrib/test/ci/vars.yml | 2 ++ contrib/test/integration/build/runc.yml | 2 +- contrib/test/integration/vars.yml | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/test/ci/build/runc.yml b/contrib/test/ci/build/runc.yml index 6f61817dcfb..04fc089402b 100644 --- a/contrib/test/ci/build/runc.yml +++ b/contrib/test/ci/build/runc.yml @@ -4,7 +4,7 @@ git: repo: "https://github.com/opencontainers/runc.git" dest: "{{ ansible_env.GOPATH }}/src/github.com/opencontainers/runc" - version: "main" + version: "{{ runc_git_version }}" - name: build runc make: diff --git a/contrib/test/ci/vars.yml b/contrib/test/ci/vars.yml index fce0e1daa47..b03e62bdc8b 100644 --- a/contrib/test/ci/vars.yml +++ b/contrib/test/ci/vars.yml @@ -156,3 +156,5 @@ kata_skip_pod_tests: - 'test "restart crio and still get pod status"' - 'test "systemd cgroup_parent correctly set"' - 'test "kubernetes pod terminationGracePeriod passthru"' + +runc_git_version: v1.1.9 diff --git a/contrib/test/integration/build/runc.yml b/contrib/test/integration/build/runc.yml index 6f61817dcfb..04fc089402b 100644 --- a/contrib/test/integration/build/runc.yml +++ b/contrib/test/integration/build/runc.yml @@ -4,7 +4,7 @@ git: repo: "https://github.com/opencontainers/runc.git" dest: "{{ ansible_env.GOPATH }}/src/github.com/opencontainers/runc" - version: "main" + version: "{{ runc_git_version }}" - name: build runc make: diff --git a/contrib/test/integration/vars.yml b/contrib/test/integration/vars.yml index 737a4e99f14..503de5ce6de 100644 --- a/contrib/test/integration/vars.yml +++ b/contrib/test/integration/vars.yml @@ -68,3 +68,5 @@ kata_skip_ctr_tests: - 'test "annotations passed through"' - 'test "ctr with default_env set in configuration"' - 'test "ctr with absent mount that should be rejected"' + +runc_git_version: v1.1.9