From eb7538232756c3e8e47053da53e89410d969be9b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 17 Jul 2026 13:28:39 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=85=E7=94=B1=20Tekton=20matrix=20?= =?UTF-8?q?=E6=B3=A8=E5=85=A5=E6=9C=8D=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/pipelines/hwlab-nc01-v03-ci-image-publish.yaml | 2 -- scripts/gitops-render.test.ts | 1 + scripts/src/gitops-render/tekton-manifests.mjs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/pipelines/hwlab-nc01-v03-ci-image-publish.yaml b/ci/pipelines/hwlab-nc01-v03-ci-image-publish.yaml index 25f37c7e..f1243371 100644 --- a/ci/pipelines/hwlab-nc01-v03-ci-image-publish.yaml +++ b/ci/pipelines/hwlab-nc01-v03-ci-image-publish.yaml @@ -653,8 +653,6 @@ spec: value: $(params.image-tag-mode) - name: registry-prefix value: $(params.registry-prefix) - - name: service-id - value: $(matrix.params.service-id) - name: base-image value: $(params.base-image) - name: build-cache-mode diff --git a/scripts/gitops-render.test.ts b/scripts/gitops-render.test.ts index ed40f78f..ead68ebb 100644 --- a/scripts/gitops-render.test.ts +++ b/scripts/gitops-render.test.ts @@ -358,6 +358,7 @@ test("v02 render follows TypeScript runtime checks and does not self-patch boots const buildServices = taskByName(pipelineJson, "build-services"); assert.deepEqual(buildServices.runAfter, ["plan-artifacts"]); assert.deepEqual(buildServices.matrix, { params: [{ name: "service-id", value: retainedServiceIds.map((id) => `hwlab-${id.replace(/^hwlab-/u, "")}`) }] }); + assert.ok(!buildServices.params.some((param) => param.name === "service-id")); const collectScript = collectArtifacts.taskSpec.steps[0].script; assert.match(collectScript, /--external-service-report-dir \/workspace\/source\/service-results/u); diff --git a/scripts/src/gitops-render/tekton-manifests.mjs b/scripts/src/gitops-render/tekton-manifests.mjs index 498a89e0..f7fc8110 100644 --- a/scripts/src/gitops-render/tekton-manifests.mjs +++ b/scripts/src/gitops-render/tekton-manifests.mjs @@ -395,7 +395,7 @@ function perServiceBuildMatrixTask(serviceIds, { runAfter = ["plan-artifacts"] } const task = perServiceBuildTask(serviceIds[0], { runAfter }); task.name = "build-services"; delete task.when; - task.params = task.params.map((param) => param.name === "service-id" ? { name: "service-id", value: "$(matrix.params.service-id)" } : param); + task.params = task.params.filter((param) => param.name !== "service-id"); task.matrix = { params: [{ name: "service-id", value: serviceIds }] }; return task; }