From 2b025f623d429a5eb56faddf1a0522fb56700438 Mon Sep 17 00:00:00 2001 From: Cory Bennett Date: Mon, 2 Nov 2020 06:32:33 +0000 Subject: [PATCH] update runc used in integration tests so exec no longer panics Signed-off-by: Cory Bennett --- Dockerfile | 3 ++- client/build_test.go | 20 -------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index a96737c0..15351952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ # syntax = docker/dockerfile:1.1-experimental -ARG RUNC_VERSION=v1.0.0-rc92 +# TODO update RUNC_VERSION with next release after 1.0-rc92 +ARG RUNC_VERSION=939ad4e3fcfa1ab531458355a73688c6f4ee5003 ARG CONTAINERD_VERSION=v1.4.0 # containerd v1.3 for integration tests ARG CONTAINERD_ALT_VERSION=v1.3.7 diff --git a/client/build_test.go b/client/build_test.go index c7c20abd..1f6ef38a 100644 --- a/client/build_test.go +++ b/client/build_test.go @@ -273,11 +273,6 @@ func testClientGatewayContainerCancelOnRelease(t *testing.T, sb integration.Sand // process together all started via `Exec` into the same container. // We are mimicing: `echo testing | cat | cat > /tmp/foo && cat /tmp/foo` func testClientGatewayContainerExecPipe(t *testing.T, sb integration.Sandbox) { - if sb.Rootless() { - // TODO remove when https://github.com/opencontainers/runc/pull/2634 - // is merged and released - t.Skip("Skipping oci-rootless for cgroup error") - } requiresLinux(t) ctx := context.TODO() @@ -468,11 +463,6 @@ func testClientGatewayContainerPID1Fail(t *testing.T, sb integration.Sandbox) { // testClientGatewayContainerPID1Exit is testing that all process started // via `Exec` are shutdown when the primary pid1 process exits func testClientGatewayContainerPID1Exit(t *testing.T, sb integration.Sandbox) { - if sb.Rootless() { - // TODO remove when https://github.com/opencontainers/runc/pull/2634 - // is merged and released - t.Skip("Skipping runc-rootless for cgroup error") - } requiresLinux(t) ctx := context.TODO() @@ -546,11 +536,6 @@ func testClientGatewayContainerPID1Exit(t *testing.T, sb integration.Sandbox) { // testClientGatewayContainerMounts is testing mounts derived from various // llb.States func testClientGatewayContainerMounts(t *testing.T, sb integration.Sandbox) { - if sb.Rootless() { - // TODO remove when https://github.com/opencontainers/runc/pull/2634 - // is merged and released - t.Skip("Skipping runc-rootless for cgroup error") - } requiresLinux(t) ctx := context.TODO() @@ -862,11 +847,6 @@ func (p *testPrompt) wait(msg string) string { // testClientGatewayContainerExecTty is testing that we can get a tty via // executor.Exec (secondary process) func testClientGatewayContainerExecTty(t *testing.T, sb integration.Sandbox) { - if sb.Rootless() { - // TODO remove when https://github.com/opencontainers/runc/pull/2634 - // is merged and released - t.Skip("Skipping runc-rootless for cgroup error") - } requiresLinux(t) ctx := context.TODO()