JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update runc used in integration tests so exec no longer panics 

Signed-off-by: Cory Bennett <cbennett@netflix.com>
v0.8
Cory Bennett 2020-11-02 06:32:33 +00:00
parent 2a6fcaeda9
commit 2b025f623d
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -1,6 +1,7 @@
# syntax = docker/dockerfile:1.1-experimental # 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 ARG CONTAINERD_VERSION=v1.4.0
# containerd v1.3 for integration tests # containerd v1.3 for integration tests
ARG CONTAINERD_ALT_VERSION=v1.3.7 ARG CONTAINERD_ALT_VERSION=v1.3.7

20
client/build_test.go
View File

@ -273,11 +273,6 @@ func testClientGatewayContainerCancelOnRelease(t *testing.T, sb integration.Sand
// process together all started via `Exec` into the same container. // process together all started via `Exec` into the same container.
// We are mimicing: `echo testing | cat | cat > /tmp/foo && cat /tmp/foo` // We are mimicing: `echo testing | cat | cat > /tmp/foo && cat /tmp/foo`
func testClientGatewayContainerExecPipe(t *testing.T, sb integration.Sandbox) { 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) requiresLinux(t)
ctx := context.TODO() ctx := context.TODO()
@ -468,11 +463,6 @@ func testClientGatewayContainerPID1Fail(t *testing.T, sb integration.Sandbox) {
// testClientGatewayContainerPID1Exit is testing that all process started // testClientGatewayContainerPID1Exit is testing that all process started
// via `Exec` are shutdown when the primary pid1 process exits // via `Exec` are shutdown when the primary pid1 process exits
func testClientGatewayContainerPID1Exit(t *testing.T, sb integration.Sandbox) { 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) requiresLinux(t)
ctx := context.TODO() ctx := context.TODO()
@ -546,11 +536,6 @@ func testClientGatewayContainerPID1Exit(t *testing.T, sb integration.Sandbox) {
// testClientGatewayContainerMounts is testing mounts derived from various // testClientGatewayContainerMounts is testing mounts derived from various
// llb.States // llb.States
func testClientGatewayContainerMounts(t *testing.T, sb integration.Sandbox) { 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) requiresLinux(t)
ctx := context.TODO() ctx := context.TODO()
@ -862,11 +847,6 @@ func (p *testPrompt) wait(msg string) string {
// testClientGatewayContainerExecTty is testing that we can get a tty via // testClientGatewayContainerExecTty is testing that we can get a tty via
// executor.Exec (secondary process) // executor.Exec (secondary process)
func testClientGatewayContainerExecTty(t *testing.T, sb integration.Sandbox) { 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) requiresLinux(t)
ctx := context.TODO() ctx := context.TODO()