support ci arm64

Signed-off-by: Kay Yan <[email protected]>
containerd · Aug 16, 2024 · c0c0a01 · c0c0a01
1 parent ccf6830
commit c0c0a01
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -55,7 +55,7 @@ jobs:
         run: go test -v ./pkg/...
 
   test-integration:
-    runs-on: "ubuntu-${{ matrix.ubuntu }}"
+    runs-on: "${{ matrix.runner }}"
     timeout-minutes: 40
     strategy:
       fail-fast: false
@@ -64,10 +64,16 @@ jobs:
         include:
           - ubuntu: 20.04
             containerd: v1.6.33
+            runner: "ubuntu-20.04"
           - ubuntu: 22.04
             containerd: v1.7.19
+            runner: "ubuntu-22.04"
+          - ubuntu: 24.04
+            containerd: v2.0.0-rc.3
+            runner: "ubuntu-24.04"
           - ubuntu: 24.04
             containerd: v2.0.0-rc.3
+            runner: github-arm64-2c-8gb
     env:
       UBUNTU_VERSION: "${{ matrix.ubuntu }}"
       CONTAINERD_VERSION: "${{ matrix.containerd }}"

diff --git a/cmd/nerdctl/container_run_linux_test.go b/cmd/nerdctl/container_run_linux_test.go
@@ -410,7 +410,8 @@ func TestRunWithFluentdLogDriver(t *testing.T) {
 
 	containerName := testutil.Identifier(t)
 	base.Cmd("run", "-d", "--name", containerName, "-p", "24224:24224",
-		"-v", fmt.Sprintf("%s:/fluentd/log", tempDirectory), testutil.FluentdImage).AssertOK()
+		"-v", fmt.Sprintf("%s:/fluentd/log", tempDirectory),
+		testutil.FluentdImage).AssertOK()
 	defer base.Cmd("rm", "-f", containerName).AssertOK()
 	time.Sleep(3 * time.Second)
 
@@ -442,7 +443,8 @@ func TestRunWithFluentdLogDriverWithLogOpt(t *testing.T) {
 
 	containerName := testutil.Identifier(t)
 	base.Cmd("run", "-d", "--name", containerName, "-p", "24225:24224",
-		"-v", fmt.Sprintf("%s:/fluentd/log", tempDirectory), testutil.FluentdImage).AssertOK()
+		"-v", fmt.Sprintf("%s:/fluentd/log", tempDirectory),
+		testutil.FluentdImage).AssertOK()
 	defer base.Cmd("rm", "-f", containerName).AssertOK()
 	time.Sleep(3 * time.Second)
 

diff --git a/pkg/testutil/testutil_linux.go b/pkg/testutil/testutil_linux.go
@@ -40,7 +40,7 @@ var (
 	WordpressIndexHTMLSnippet   = "<title>WordPress &rsaquo; Installation</title>"
 	MariaDBImage                = mirrorOf("mariadb:10.5")
 	DockerAuthImage             = mirrorOf("cesanta/docker_auth:1.7")
-	FluentdImage                = mirrorOf("fluent/fluentd:v1.14-1")
+	FluentdImage                = "fluent/fluentd:v1.17.0-debian-1.0"
 	KuboImage                   = mirrorOf("ipfs/kubo:v0.16.0")
 	SystemdImage                = "ghcr.io/containerd/stargz-snapshotter:0.15.1-kind"