From a255aa7675629a0716ac54bbabf69ad2b8d36ce4 Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Sat, 8 Aug 2026 13:52:54 -0500 Subject: [PATCH 1/6] test(DEN-2877): add disposable Zed dependency edge --- .zpkg.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.zpkg.toml b/.zpkg.toml index 744dce6..fbb0b01 100644 --- a/.zpkg.toml +++ b/.zpkg.toml @@ -1,4 +1,5 @@ # generated by zed-pkg-test/test-org-fleet; edit the fleet manifest or bootstrapper, not this file. +# disposable DEN-2877 canary: this branch and PR must never be merged. [package] org = "zed-pkg-test" name = "java-app" @@ -15,3 +16,4 @@ dir = ".vendor/.zed" [dependencies] "zed-pkg/zed-clients" = "^0.1.0" +"zed-pkg-test/java-lib" = "^0.1.1" From d032d2c1fab5b0011438c50abe4ad719a0550615 Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Sat, 8 Aug 2026 13:53:03 -0500 Subject: [PATCH 2/6] test(DEN-2877): add disposable git-submodule edge --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index d3463ab..7da8aff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,9 @@ # generated by zed-pkg-test/test-org-fleet; edit the fleet manifest or bootstrapper, not this file. +# disposable DEN-2877 canary: this branch and PR must never be merged. [submodule "vendor/zed-clients"] path = vendor/zed-clients url = https://github.com/zed-pkg/zed-clients.git +[submodule "vendor/java-lib"] + path = vendor/java-lib + url = https://github.com/zed-pkg-test/java-lib.git From aa0f846e6117ca64c511df633379a39d23d37b4d Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Sat, 8 Aug 2026 13:53:18 -0500 Subject: [PATCH 3/6] test(DEN-2877): pin dependency PR in generated test plan --- test-plan.json | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/test-plan.json b/test-plan.json index e9244f4..b7e3907 100644 --- a/test-plan.json +++ b/test-plan.json @@ -1,5 +1,5 @@ { - "generatedBy": "generated by zed-pkg-test/test-org-fleet", + "generatedBy": "generated by zed-pkg-test/test-org-fleet; disposable DEN-2877 canary", "schemaVersion": 1, "sourceOrganization": "zed-pkg", "testOrganization": "zed-pkg-test", @@ -9,7 +9,8 @@ "focus": [ "consumer install", "classpath wiring", - "offline frozen restore" + "offline frozen restore", + "nightly dependent reconciliation through Zed and gitlinks" ], "services": [], "matrix": {}, @@ -34,6 +35,13 @@ "branch": "main", "sha": "c97ead9ce1cd3675be7704d35e2395fa59f4baa4", "visibility": "public" + }, + { + "fullName": "zed-pkg-test/java-lib", + "exists": true, + "branch": "canary/den-2877-java-lib-dependency", + "sha": "c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd", + "visibility": "public" } ], "sourceGates": [], @@ -51,6 +59,15 @@ "source": "zed-pkg/zed-clients", "mode": "native-package", "manager": "maven" + }, + { + "source": "zed-pkg-test/java-lib", + "mode": "git-submodule", + "path": "vendor/java-lib" + }, + { + "source": "zed-pkg-test/java-lib", + "mode": "zed" } ], "security": { @@ -58,5 +75,11 @@ "pullRequestCredentials": false, "leastPrivilege": true, "redactSecretsAndRawMedia": true + }, + "canary": { + "linearIssue": "DEN-2877", + "dependencyPullRequest": "zed-pkg-test/java-lib#2", + "mergeForbidden": true, + "disposable": true } } From 89a5d273b949c17e6d74a7f9d4cbc47387f0dd4c Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Sat, 8 Aug 2026 13:53:31 -0500 Subject: [PATCH 4/6] test(DEN-2877): record exact dependency PR source pin --- source-pins.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source-pins.json b/source-pins.json index d624485..4371dfd 100644 --- a/source-pins.json +++ b/source-pins.json @@ -1,5 +1,5 @@ { - "generatedBy": "generated by zed-pkg-test/test-org-fleet", + "generatedBy": "generated by zed-pkg-test/test-org-fleet; disposable DEN-2877 canary", "sources": { "zed-pkg/zed-cli": { "branch": "main", @@ -10,6 +10,13 @@ "branch": "main", "sha": "c97ead9ce1cd3675be7704d35e2395fa59f4baa4", "exists": true + }, + "zed-pkg-test/java-lib": { + "branch": "canary/den-2877-java-lib-dependency", + "sha": "c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd", + "exists": true, + "pullRequest": 2, + "mergeForbidden": true } } } From dc71f7a3fe8107f55d37ce95f40c74c1f20795f3 Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Sat, 8 Aug 2026 13:53:41 -0500 Subject: [PATCH 5/6] test(DEN-2877): describe disposable dependent canary --- canary/nightly-reconciliation-dependent.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 canary/nightly-reconciliation-dependent.json diff --git a/canary/nightly-reconciliation-dependent.json b/canary/nightly-reconciliation-dependent.json new file mode 100644 index 0000000..677626d --- /dev/null +++ b/canary/nightly-reconciliation-dependent.json @@ -0,0 +1,16 @@ +{ + "schema_version": "nightly-reconciliation-canary.v1", + "linear_issue": "DEN-2877", + "source_policy_pr": "ORESoftware/project-registry#44", + "scenario": "dependent-pr-references-open-dependency-pr-through-zed-and-gitlink", + "repository": "zed-pkg-test/java-app", + "base_sha": "59ea6f7473edfc6e8675fc7c2f7d7b0589611060", + "dependency_repository": "zed-pkg-test/java-lib", + "dependency_pull_request": 2, + "dependency_head_sha": "c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd", + "zed_requirement": "^0.1.1", + "gitlink_path": "vendor/java-lib", + "disposable": true, + "merge_forbidden": true, + "purpose": "Prove that the nightly reconciler discovers and re-evaluates a dependent PR when an open dependency PR changes, using both Zed metadata and an exact git submodule edge." +} From 912c119feb8bc87027f9b5a7e72c4dc5618c193a Mon Sep 17 00:00:00 2001 From: Alexander Mills Date: Sat, 8 Aug 2026 13:54:19 -0500 Subject: [PATCH 6/6] test(DEN-2877): pin dependent canary gitlink to dependency PR head --- vendor/java-lib | 1 + 1 file changed, 1 insertion(+) create mode 160000 vendor/java-lib diff --git a/vendor/java-lib b/vendor/java-lib new file mode 160000 index 0000000..c9fa3cb --- /dev/null +++ b/vendor/java-lib @@ -0,0 +1 @@ +Subproject commit c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd