fix: keep G14 generated state on gitops branch

2026-05-27 10:14:24 +08:00
parent 278bbe1c6a
commit 336a9b2c2c
10 changed files with 188 additions and 154 deletions
@@ -196,7 +196,6 @@ function assertCatalogServices(catalog, deployManifest, catalogMode) {
    assert.ok(deployService, `${context} missing from deploy manifest`);

    assertCommitId(service.commitId, `${context} commitId`);
-    assert.equal(service.commitId, catalog.commitId, `${context} commitId must match catalog`);
    assert.equal(service.imageTag, service.commitId.slice(0, 7), `${context} imageTag must be the short commit`);
    assertNoMutableTag(service.imageTag, `${context} imageTag`);

@@ -233,7 +232,7 @@ function assertCatalogServices(catalog, deployManifest, catalogMode) {
      assert.equal(service.digest, "not_published", `${context} digest`);
    } else {
      if (service.artifactRequired) {
-        assert.equal(service.publishState, "published", `${context} publishState`);
+        assert.ok(["published", "reused"].includes(service.publishState), `${context} publishState`);
        assert.match(service.digest, digestPattern, `${context} digest`);
      } else {
        assert.equal(service.publishState, "skeleton-only", `${context} publishState`);