diff --git a/scripts/artifact-publish.mjs b/scripts/artifact-publish.mjs index 883bcd36..5e128f9b 100644 --- a/scripts/artifact-publish.mjs +++ b/scripts/artifact-publish.mjs @@ -1860,7 +1860,12 @@ async function writeTektonResultFiles(dir, report) { "boot-sh": service.bootSh ?? "", "build-created-at": service.buildCreatedAt ?? "", "build-backend": report.artifactPublish.buildBackend ?? "unknown", - "reused-from": service.reusedFrom ?? "" + "reused-from": service.reusedFrom ?? "", + "go-base-image": service.goBaseImage ?? "", + "go-base-image-status": service.goBaseImageStatus ?? "", + "go-base-digest": service.goBaseDigest ?? "", + "go-base-build-duration-ms": service.goBaseBuildDurationMs ?? "", + "go-base-buildkit-cache-ref": service.goBaseBuildkitCacheRef ?? "" }; await mkdir(dir, { recursive: true }); await Promise.all(Object.entries(values).map(([name, value]) => writeFile(path.join(dir, name), String(value ?? "")))); @@ -2496,6 +2501,11 @@ function createReport({ args, repo, commitId, shortCommit, mode, services, artif buildBackend: artifact.buildBackend ?? args.buildBackend, buildkitCacheMode: artifact.buildkitCacheMode ?? args.buildCacheMode, buildkitCacheRef: artifact.buildkitCacheRef ?? null, + goBaseImage: artifact.goBaseImage ?? null, + goBaseImageStatus: artifact.goBaseImageStatus ?? null, + goBaseDigest: artifact.goBaseDigest ?? null, + goBaseBuildDurationMs: artifact.goBaseBuildDurationMs ?? null, + goBaseBuildkitCacheRef: artifact.goBaseBuildkitCacheRef ?? null, cloudWebBuildDurationMs: artifact.cloudWebBuildDurationMs ?? null, publishDurationMs: artifact.publishDurationMs ?? null, componentCommitId: artifact.componentCommitId ?? null, diff --git a/scripts/ci-plan.test.mjs b/scripts/ci-plan.test.mjs index 09fbdb39..9529f7cb 100644 --- a/scripts/ci-plan.test.mjs +++ b/scripts/ci-plan.test.mjs @@ -1237,6 +1237,8 @@ test("Go env build path declares base image, stable timing, and late volatile la assert.match(source, /const effectiveBaseImage = goBaseImageEnabled \? normalizedRecipe\.goBaseImage : baseImage/u); assert.match(envDockerfileSource, /timed_stage "go-mod-download"/u); assert.match(envDockerfileSource, /timed_stage "env-readiness"/u); + assert.match(source, /goBaseImage: artifact\.goBaseImage \?\? null/u); + assert.match(source, /"go-base-image-status": service\.goBaseImageStatus \?\? ""/u); const labelIndex = envDockerfileSource.indexOf("...labels.map(([name, value]) => `LABEL"); const readinessIndex = envDockerfileSource.indexOf('timed_stage "env-readiness"');