skip the BuildKit tests in the rootless integration

Signed-off-by: Kay Yan <[email protected]>
containerd · Jun 23, 2023 · 9a95883 · 9a95883
1 parent f21bca5
commit 9a95883
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -149,7 +149,7 @@ jobs:
       - name: "Prepare (network driver=slirp4netns, port driver=builtin)"
         run: DOCKER_BUILDKIT=1 docker build -t ${TEST_TARGET} --target ${TEST_TARGET} --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} .
       - name: "Test (network driver=slirp4netns, port driver=builtin)"
-        run: docker run -t --rm --privileged ${TEST_TARGET}
+        run: docker run -t --rm --privileged -e WORKAROUND_CIRRUS=1 ${TEST_TARGET}
 
   cross:
     runs-on: ubuntu-22.04

diff --git a/cmd/nerdctl/container_run_test.go b/cmd/nerdctl/container_run_test.go
@@ -357,6 +357,7 @@ func TestRunWithJournaldLogDriverAndLogOpt(t *testing.T) {
 }
 
 func TestRunWithLogBinary(t *testing.T) {
+	testutil.RequiresBuild(t)
 	if runtime.GOOS == "windows" {
 		t.Skip("buildkit is not enabled on windows, this feature may work on windows.")
 	}

diff --git a/cmd/nerdctl/image_encrypt_linux_test.go b/cmd/nerdctl/image_encrypt_linux_test.go
@@ -107,6 +107,7 @@ func rmiAll(base *testutil.Base) {
 }
 
 func TestImageEncryptJWE(t *testing.T) {
+	testutil.RequiresBuild(t)
 	testutil.DockerIncompatible(t)
 	keyPair := newJWEKeyPair(t)
 	defer keyPair.cleanup()

diff --git a/cmd/nerdctl/image_push_linux_test.go b/cmd/nerdctl/image_push_linux_test.go
@@ -28,6 +28,7 @@ import (
 )
 
 func TestPushPlainHTTPFails(t *testing.T) {
+	testutil.RequiresBuild(t)
 	base := testutil.NewBase(t)
 	reg := testregistry.NewPlainHTTP(base, 5000)
 	defer reg.Cleanup()
@@ -46,6 +47,7 @@ func TestPushPlainHTTPFails(t *testing.T) {
 }
 
 func TestPushPlainHTTPLocalhost(t *testing.T) {
+	testutil.RequiresBuild(t)
 	base := testutil.NewBase(t)
 	reg := testregistry.NewPlainHTTP(base, 5000)
 	defer reg.Cleanup()
@@ -62,6 +64,7 @@ func TestPushPlainHTTPLocalhost(t *testing.T) {
 }
 
 func TestPushPlainHTTPInsecure(t *testing.T) {
+	testutil.RequiresBuild(t)
 	// Skip docker, because "dockerd --insecure-registries" requires restarting the daemon
 	testutil.DockerIncompatible(t)
 
@@ -79,6 +82,7 @@ func TestPushPlainHTTPInsecure(t *testing.T) {
 }
 
 func TestPushPlainHttpInsecureWithDefaultPort(t *testing.T) {
+	testutil.RequiresBuild(t)
 	// Skip docker, because "dockerd --insecure-registries" requires restarting the daemon
 	testutil.DockerIncompatible(t)
 
@@ -96,6 +100,7 @@ func TestPushPlainHttpInsecureWithDefaultPort(t *testing.T) {
 }
 
 func TestPushInsecureWithLogin(t *testing.T) {
+	testutil.RequiresBuild(t)
 	// Skip docker, because "dockerd --insecure-registries" requires restarting the daemon
 	testutil.DockerIncompatible(t)
 
@@ -116,6 +121,7 @@ func TestPushInsecureWithLogin(t *testing.T) {
 }
 
 func TestPushWithHostsDir(t *testing.T) {
+	testutil.RequiresBuild(t)
 	// Skip docker, because Docker doesn't have `--hosts-dir` option, and we don't want to contaminate the global /etc/docker/certs.d during this test
 	testutil.DockerIncompatible(t)
 
@@ -135,6 +141,7 @@ func TestPushWithHostsDir(t *testing.T) {
 }
 
 func TestPushNonDistributableArtifacts(t *testing.T) {
+	testutil.RequiresBuild(t)
 	// Skip docker, because "dockerd --insecure-registries" requires restarting the daemon
 	// Skip docker, because "--allow-nondistributable-artifacts" is a daemon-only option and requires restarting the daemon
 	testutil.DockerIncompatible(t)