CI: move cgroup v2 tests to Cirrus

For simplicity, switch away from Fedora 35 Vagrant on GHA to Ubuntu 21.10 on Cirrus

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

.cirrus.yml

@@ -1,8 +1,46 @@
-freebsd_instance:
-  image_family: freebsd-13-0
+# GitHub Actions does not support cgroup v2, so we use Cirrus for cgroup v2.
+linux_cgroup2_task:
+  name: "Linux/cgroup2"
+  timeout_in: 60m
+  compute_engine_instance:
+    image_project: ubuntu-os-cloud
+    image: family/ubuntu-2110
+    # CPU limit: `16 / NTASK`: see https://cirrus-ci.org/faq/#are-there-any-limits
+    cpu: 4
+    # Memory limit: `4GB * NCPU`
+    memory: 16G
+    disk: 100
+  env:
+    DEBIAN_FRONTEND: noninteractive
+    DOCKER_BUILDKIT: 1
+  # Remove snap loopback devices (conflicts with our loopback devices in TestRunDevice)
+  remove_snapd_script:
+    - systemctl disable --now snapd.service snapd.socket
+    - apt-get purge -y snapd
+    - losetup -Dv
+    - losetup -lv
+  install_docker_script:
+    - apt-get update
+    - apt-get install -y docker.io
+    - docker info
+  rootful_build_script:
+    - docker build -t test-integration --target test-integration .
+  rootful_test_script:
+    - docker run -t --rm --privileged test-integration
+  rootless_build_script:
+    - docker build -t test-integration-rootless --target test-integration-rootless .
+  rootless_test_script:
+    - docker run -t --rm --privileged test-integration-rootless
 
-task:
-  name: test-freebsd-amd64
+freebsd_task:
+  name: "FreeBSD"
+  timeout_in: 20m
+  compute_engine_instance:
+    image_project: freebsd-org-cloud-dev
+    image: family/freebsd-13-0
+    platform: freebsd
+    cpu: 2
+    memory: 4G
   env:
     NERDCTL_RUN_ARGS: --net none knast/freebsd:13-STABLE echo "Nerdctl is up and running."
   install_script:
@@ -14,12 +52,17 @@ task:
     - sudo go run . run $NERDCTL_RUN_ARGS | grep running
 # TODO: run `go test -v ./cmd/...`
 
-docker_builder:
-  name: windows
-  platform: windows
-  os_version: 2019
+windows_task:
+  name: "Windows"
+  timeout_in: 20m
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/windows-docker-builder
+    platform: windows
+    cpu: 2
+    memory: 4G
   matrix:
-    - name: Windows 1.6 tests
+    - name: "Windows/containerd-1.6"
       env:
         ctrdVersion: 1.6.0-beta.3
   env:

.github/workflows/test.yml

@@ -73,7 +73,7 @@ jobs:
     - name: "Register QEMU (tonistiigi/binfmt)"
       run: docker run --privileged --rm tonistiigi/binfmt --install all
     - name: "Run integration tests"
-      run: docker run -t --rm --privileged test-integration go test -v ./cmd/nerdctl/... -args -test.kill-daemon
+      run: docker run -t --rm --privileged test-integration
 
   test-integration-rootless:
     runs-on: ubuntu-20.04
@@ -125,50 +125,3 @@ jobs:
       run: docker run --privileged --rm tonistiigi/binfmt --install all
     - name: "Ensure that the integration test suite is compatible with Docker"
       run: go test -v -exec sudo ./cmd/nerdctl/... -args -test.target=docker -test.kill-daemon
-
-  test-integration-cgroup2:
-    # nested virtualization is only available on macOS hosts
-    runs-on: macos-10.15
-    timeout-minutes: 50
-    env:
-      VAGRANT_VAGRANTFILE: hack/Vagrantfile.fedora
-    steps:
-    - uses: actions/setup-go@v2
-      with:
-        go-version: 1.17.x
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-    # Vagrant is slow, so we build binaries outside Vagrant
-    - name: "Build binaries"
-      run: |
-        GOOS=linux make binaries
-        GOOS=linux go test -c ./cmd/nerdctl
-    - name: "Boot VM"
-      run: |
-        vagrant up
-        vagrant ssh-config >> ~/.ssh/config
-    - name: "Show info"
-      run: ssh default -- sudo nerdctl info
-    - name: "Run tests"
-      uses: nick-invision/retry@v2
-      with:
-        timeout_minutes: 10
-        retry_on: error
-        max_attempts: 2
-        # TODO: enable -test.kill-daemon
-        command: ssh default -- "sudo /vagrant/nerdctl.test -test.v"
-    - name: "Install rootless containerd"
-      run: |
-        ssh default -- containerd-rootless-setuptool.sh install
-    - name: "Show info (rootless)"
-      run: ssh default -- nerdctl info
-    - name: "Run tests (rootless)"
-      uses: nick-invision/retry@v2
-      with:
-        timeout_minutes: 10
-        retry_on: error
-        max_attempts: 2
-        command: ssh default -- "/vagrant/nerdctl.test -test.v -test.kill-daemon"
-    - name: "Uninstall rootless containerd"
-      run: ssh default -- containerd-rootless-setuptool.sh uninstall

Dockerfile

@@ -249,7 +249,7 @@ RUN systemctl enable test-integration-ipfs-offline && \
     ipfs init && \
     ipfs config Addresses.API "/ip4/127.0.0.1/tcp/5888" && \
     ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/5889"
-CMD ["go", "test", "-v", "./cmd/nerdctl/..."]
+CMD ["go", "test", "-v", "./cmd/nerdctl/...", "-args", "-test.kill-daemon"]
 
 FROM test-integration AS test-integration-rootless
 # Install SSH for creating systemd user session.
@@ -267,6 +267,7 @@ RUN ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N '' && \
   cp -a /root/.ssh/id_rsa.pub /home/rootless/.ssh/authorized_keys && \
   mkdir -p /home/rootless/.local/share && \
   chown -R rootless:rootless /home/rootless
+COPY ./Dockerfile.d/[email protected]_delegate.conf /etc/systemd/system/[email protected]/delegate.conf
 # ipfs daemon for rootless containerd will be enabled in /test-integration-rootless.sh
 RUN systemctl disable test-integration-ipfs-offline
 VOLUME /home/rootless/.local/share

Dockerfile.d/[email protected]_delegate.conf

@@ -0,0 +1,2 @@
+[Service]
+Delegate=yes