wolfi+ci: improve wolfi image annotation (#57586)

* add wolfi annotation ctx

* fix formatting of annoation and use annotatedCmd

* add job output link

* Update wolfi-images/cadvisor.yaml

Co-authored-by: Will Dollman <will.dollman@sourcegraph.com>

---------

Co-authored-by: Will Dollman <will.dollman@sourcegraph.com>

Author: burmudar

dev/ci/internal/ci/wolfi_operations.go

@@ -101,8 +101,15 @@ func buildWolfiBaseImage(target string, tag string, dependOnPackages bool) (func
 
 	return func(pipeline *bk.Pipeline) {
 
+		cmd := fmt.Sprintf("./dev/ci/scripts/wolfi/build-base-image.sh %s %s", target, tag)
 		opts := []bk.StepOpt{
-			bk.Cmd(fmt.Sprintf("./dev/ci/scripts/wolfi/build-base-image.sh %s %s", target, tag)),
+			bk.AnnotatedCmd(cmd, bk.AnnotatedCmdOpts{
+				Annotations: &bk.AnnotationOpts{
+					Type:            bk.AnnotationTypeInfo,
+					IncludeNames:    false,
+					MultiJobContext: "wolfi-images",
+				},
+			}),
 			// We want to run on the bazel queue, so we have a pretty minimal agent.
 			bk.Agent("queue", "bazel"),
 			bk.Env("DOCKER_BAZEL", "true"),

dev/ci/scripts/wolfi/build-base-image.sh

@@ -148,9 +148,19 @@ fi
 # Show image usage message on branches
 if [[ "$IS_MAIN" != "true" ]]; then
   if [[ -n "$BUILDKITE" ]]; then
-    echo -e "Run the \`${name}\` base image locally using:
-\`\`\`
+    mkdir -p ./annotations
+    file="${name} image.md"
+    cat <<-EOF > "${REPO_DIR}/annotations/${file}"
+
+<strong>:octopus: ${name} image &bull; [View job output](#${BUILDKITE_JOB_ID})</strong>
+<br />
+<br />
+Run the \`${name}\` base image locally using:
+
+\`\`\`bash
 docker pull us.gcr.io/sourcegraph-dev/wolfi-${name}-base:${tag}
-  \`\`\`" | "$REPO_DIR/dev/ci/scripts/annotate.sh" -m -t "info"
+\`\`\`
+
+EOF
   fi
 fi