Fix upgrade test runtime config

dmcgowan · dmcgowan · commit 93cc1e6eb96c · 2025-03-12T10:02:26.000-07:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/integration/release_upgrade_linux_test.go b/integration/release_upgrade_linux_test.go
@@ -546,8 +546,7 @@ func (pCtx *podTCtx) shimPid() uint32 {
 	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 	defer cancel()
 
-	// NOTE: use version 2 to be compatible with previous release
-	shimCli := connectToShim(ctx, t, cfg["containerdEndpoint"].(string), 2, pCtx.id)
+	shimCli := connectToShim(ctx, t, cfg["containerdEndpoint"].(string), 3, pCtx.id)
 	return shimPid(ctx, t, shimCli)
 }
 
@@ -634,7 +633,8 @@ func previousReleaseCtrdConfig(t *testing.T, previousReleaseBinDir, targetDir st
 version = 2
 
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-  runtime_type = "%s/bin/containerd-shim-runc-v2"
+  runtime_type = "io.containerd.runc.v2"
+  runtime_path = "%s/bin/containerd-shim-runc-v2"
 `,
 		previousReleaseBinDir)
 
