Merge pull request #3206 from AkihiroSuda/ci-shrink-matrix

CI: shrink test matrix
containerd · Jul 9, 2024 · a47463b · a47463b
2 parents 987d720 + 3a0df16
commit a47463b
Showing 1 changed file with 1 addition and 31 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -58,14 +58,8 @@ jobs:
         include:
           - ubuntu: 20.04
             containerd: v1.6.33
-          - ubuntu: 20.04
-            containerd: v1.7.19
           - ubuntu: 22.04
             containerd: v1.7.19
-          - ubuntu: 22.04
-            containerd: main  # v2.0.0-rc.X
-          - ubuntu: 24.04
-            containerd: v1.7.19
           - ubuntu: 24.04
             containerd: main  # v2.0.0-rc.X
     env:
@@ -152,42 +146,18 @@ jobs:
         include:
           - ubuntu: 20.04
             containerd: v1.6.33
-            rootlesskit: v1.1.1
-            target: test-integration-rootless
-          - ubuntu: 20.04
-            containerd: v1.7.19
-            rootlesskit: v2.1.0
+            rootlesskit: v1.1.1  # Deprecated
             target: test-integration-rootless
           - ubuntu: 22.04
             containerd: v1.7.19
-            rootlesskit: v1.1.1
-            target: test-integration-rootless
-          - ubuntu: 22.04
-            containerd: main  # v2.0.0-rc.X
             rootlesskit: v2.1.0
             target: test-integration-rootless
-          - ubuntu: 24.04
-            containerd: v1.7.19
-            rootlesskit: v1.1.1
-            target: test-integration-rootless
           - ubuntu: 24.04
             containerd: main  # v2.0.0-rc.X
             rootlesskit: v2.1.0
             target: test-integration-rootless
-          - ubuntu: 20.04
-            containerd: v1.6.33
-            rootlesskit: v1.1.1
-            target: test-integration-rootless-port-slirp4netns
-          - ubuntu: 20.04
-            containerd: v1.7.19
-            rootlesskit: v2.1.0
-            target: test-integration-rootless-port-slirp4netns
           - ubuntu: 24.04
             containerd: v1.7.19
-            rootlesskit: v1.1.1
-            target: test-integration-rootless-port-slirp4netns
-          - ubuntu: 24.04
-            containerd: main  # v2.0.0-rc.X
             rootlesskit: v2.1.0
             target: test-integration-rootless-port-slirp4netns
     env: