Merge pull request #4376 from AkihiroSuda/test-v1-shim

CI: add back shim v1 test

.github/workflows/ci.yml

@@ -320,11 +320,13 @@ jobs:
 
     strategy:
       matrix:
-        runtime: [io.containerd.runc.v1, io.containerd.runc.v2]
+        runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2]
         runc: [runc, crun]
         exclude:
           - runtime: io.containerd.runc.v1
             runc: crun
+          - runtime: io.containerd.runtime.v1.linux
+            runc: crun
 
     steps:
       - name: Install Go

container_test.go

@@ -36,6 +36,7 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/containerd/plugin"
 	_ "github.com/containerd/containerd/runtime"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/typeurl"
@@ -661,6 +662,10 @@ func TestKillContainerDeletedByRunc(t *testing.T) {
 	}
 	defer client.Close()
 
+	if client.runtime == plugin.RuntimeLinuxV1 {
+		t.Skip("test relies on runtime v2")
+	}
+
 	var (
 		image       Image
 		ctx, cancel = testContext(t)