Merge pull request #1922 from ktock/fixci-a

CI: Fix some tests don't run
containerd · Jan 6, 2025 · db7c74e · db7c74e
2 parents d8470f9 + 054b5ae
commit db7c74e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,7 +53,6 @@ jobs:
       fail-fast: false
       matrix:
         buildargs: ["", "--build-arg=CONTAINERD_VERSION=main"] # released version & main version
-        buildargs: [""]
         builtin: ["true", "false"]
         metadata-store: ["memory", "db"]
         exclude:
@@ -81,7 +80,6 @@ jobs:
       fail-fast: false
       matrix:
         buildargs: ["", "--build-arg=CONTAINERD_VERSION=main"] # released version & main version
-        buildargs: [""]
     steps:
     - name: Install htpasswd for setting up private registry
       run: sudo apt-get update -y && sudo apt-get --no-install-recommends install -y apache2-utils
@@ -98,7 +96,6 @@ jobs:
       fail-fast: false
       matrix:
         buildargs: ["", "--build-arg=CONTAINERD_VERSION=main"] # released version & main version
-        buildargs: [""]
         builtin: ["true", "false"]
         exclude:
         - buildargs: ""
@@ -120,7 +117,6 @@ jobs:
       fail-fast: false
       matrix:
         buildargs: ["", "--build-arg=CONTAINERD_VERSION=main"] # released version & main version
-        buildargs: [""]
         builtin: ["true", "false"]
         exclude:
         - buildargs: ""
@@ -142,7 +138,6 @@ jobs:
       fail-fast: false
       matrix:
         buildargs: ["", "--build-arg=CONTAINERD_VERSION=main"] # released version & main version
-        buildargs: [""]
         builtin: ["true", "false"]
         metadata-store: ["memory", "db"]
         exclude:

diff --git a/analyzer/analyzer.go b/analyzer/analyzer.go
@@ -225,6 +225,9 @@ func Analyze(ctx context.Context, client *containerd.Client, ref string, opts ..
 			successCount++
 		}
 	}()
+	if err := task.Start(ctx); err != nil {
+		return "", err
+	}
 	if aOpts.terminal {
 		if err := tasks.HandleConsoleResize(ctx, task, con); err != nil {
 			log.G(ctx).WithError(err).Error("failed to resize console")
@@ -233,9 +236,6 @@ func Analyze(ctx context.Context, client *containerd.Client, ref string, opts ..
 		sigc := commands.ForwardAllSignals(ctx, task)
 		defer commands.StopCatch(sigc)
 	}
-	if err := task.Start(ctx); err != nil {
-		return "", err
-	}
 
 	// Wait until the task exit
 	var status containerd.ExitStatus