Merge pull request #734 from AkihiroSuda/debug-20220126

Cirrus: skip BuildKit tests

Author: AkihiroSuda

.cirrus.yml

@@ -30,8 +30,8 @@ linux_cgroup2_task:
   rootless_build_script:
     - docker build -t test-integration-rootless --target test-integration-rootless .
   rootless_test_script:
-    # FORCE_TCP_DNS: Workaround for https://github.com/containerd/nerdctl/issues/622
-    - docker run -t --rm --privileged -e FORCE_TCP_DNS=1 test-integration-rootless
+    # WORKAROUND_CIRRUS: Workaround for https://github.com/containerd/nerdctl/issues/622
+    - docker run -t --rm --privileged -e WORKAROUND_CIRRUS=1 test-integration-rootless
 
 freebsd_task:
   name: "FreeBSD"

Dockerfile.d/test-integration-rootless.sh

@@ -21,11 +21,9 @@ if [[ "$(id -u)" = "0" ]]; then
 		nerdctl apparmor load
 	fi
 
-	: "${FORCE_TCP_DNS:=}"
-	if [[ "$FORCE_TCP_DNS" = "1" ]]; then
-		# Workaround for https://github.com/containerd/nerdctl/issues/622
-		# ERROR: failed to do request: Head "https://ghcr.io/v2/stargz-containers/alpine/manifests/3.13-org": dial tcp: lookup ghcr.io on 10.0.2.3:53: read udp 10.0.2.100:50602->10.0.2.3:53: i/o timeout
-		echo "options use-vc" >>/etc/resolv.conf
+	: "${WORKAROUND_CIRRUS:=}"
+	if [[ "$WORKAROUND_CIRRUS" = "1" ]]; then
+		touch /workaround-cirrus
 	fi
 
 	# Switch to the rootless user via SSH
@@ -36,7 +34,12 @@ else
 	if grep -q "options use-vc" /etc/resolv.conf; then
 		containerd-rootless-setuptool.sh nsenter -- sh -euc 'echo "options use-vc" >>/etc/resolv.conf'
 	fi
-	containerd-rootless-setuptool.sh install-buildkit
+
+	if [[ -e /workaround-cirrus ]]; then
+		echo "WORKAROUND_CIRRUS: Not enabling BuildKit (https://github.com/containerd/nerdctl/issues/622)" >&2
+	else
+		containerd-rootless-setuptool.sh install-buildkit
+	fi
 	containerd-rootless-setuptool.sh install-stargz
 	cat <<EOF >>/home/rootless/.config/containerd/config.toml
 [proxy_plugins]