Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Keep the patch cut deadline out of soaked promotion

pulse-triage[bot]576f54b5b16f
diff --git a/docs/release-control/v6/internal/subsystems/deployment-installability.md b/docs/release-control/v6/internal/subsystems/deployment-installability.md
index ebc7387716..00a7536107 100644
--- a/docs/release-control/v6/internal/subsystems/deployment-installability.md
+++ b/docs/release-control/v6/internal/subsystems/deployment-installability.md
@@ -48,16 +48,18 @@ the train; branch admission does not remove or synthesise a required check.
Slow collection cannot reserve an obsolete base or consume fixes after the
48-hour cut boundary. The train rechecks the current stable's tag/source and
-minor-anchored clock at reservation and before later preparation, merge and
-dispatch mutations. A superseded/late reserved patch is abandoned without
+minor-anchored clock at reservation and before later RC preparation, merge and
+dispatch mutations. A superseded/late reserved cut is abandoned without
changing the independent minor's state.
Both normal activation and activation-only recovery run the source-bound
`stable_patch.py activation-check` immediately before their publication PATCH.
It reads the exact candidate manifest, complete bounded published-release
inventory, base-tag commit and the minor's actual publication date. A newer
-stable, changed base, unknown/failed evidence or arrival at the 48-hour boundary
-stops publication. A recent patch cannot reset the minor clock. This is a final
+stable, changed base or unknown/failed evidence stops publication. Arrival at
+the 48-hour boundary also stops a new rc.1 cut, never the unchanged promotion
+of an already-cut, soaked patch: the cut rule is not an extra promotion hold.
+A recent patch cannot reset the minor clock. This is a final
read-before-write fence, not an atomic cross-workflow provider transaction;
existing activation identities, quarantine and immutability checks remain.
Minor/beta and historical-line paths gain no new patch gate.
diff --git a/scripts/release_control/stable_patch.py b/scripts/release_control/stable_patch.py
index 4b5f824bd2..b8fc75312e 100644
--- a/scripts/release_control/stable_patch.py
+++ b/scripts/release_control/stable_patch.py
@@ -241,6 +241,11 @@ def activation_check(root: Path, version: str, source_sha: str) -> dict:
commit = api(f"commits/{receipt['stable_tag']}")
if not isinstance(commit, dict) or commit.get("sha") != receipt["stable_sha"]:
raise ValueError("published patch base source changed before activation")
+ if match.group(4) is None:
+ # The 48-hour rule forbids a NEW patch cut. It must not become an
+ # additional hold on promotion of its already-cut, soaked rc.1.
+ return {"applicable": True, "source_sha": source_sha, "stable_tag": current["tag_name"],
+ "stable_sha": receipt["stable_sha"], "observed_at": time.time(), "new_cut": False}
anchor_tag = f"v{major}.{minor}.0"
anchor = current if current["tag_name"] == anchor_tag else api(f"releases/tags/{anchor_tag}")
due = published_at(anchor, anchor_tag) + MINOR_CYCLE_SECONDS - MINOR_SOAK_SECONDS
@@ -248,7 +253,7 @@ def activation_check(root: Path, version: str, source_sha: str) -> dict:
observed = time.time()
if observed >= due - PATCH_MARGIN_SECONDS:
raise ValueError("patch activation is within 48 hours of minor candidate eligibility (or overdue)")
- return {"applicable": True, "source_sha": source_sha, "stable_tag": current["tag_name"],
+ return {"applicable": True, "new_cut": True, "source_sha": source_sha, "stable_tag": current["tag_name"],
"stable_sha": receipt["stable_sha"], "observed_at": observed,
"not_after": datetime.fromtimestamp(due - PATCH_MARGIN_SECONDS, timezone.utc).isoformat()}
diff --git a/scripts/release_control/stable_patch_test.py b/scripts/release_control/stable_patch_test.py
index 565fb81972..f8bac51961 100644
--- a/scripts/release_control/stable_patch_test.py
+++ b/scripts/release_control/stable_patch_test.py
@@ -189,13 +189,14 @@ class StablePatchTest(unittest.TestCase):
with self.subTest(version=version, elapsed=elapsed), \
mock.patch.object(patch, 'api', side_effect=read), \
mock.patch.object(patch.time, 'time', return_value=stamp) as clock:
- if elapsed >= 3 * 86400:
+ if elapsed >= 3 * 86400 and version.endswith('-rc.1'):
with self.assertRaisesRegex(ValueError, '48 hours'):
patch.activation_check(self.root, version, self.head())
else:
result = patch.activation_check(self.root, version, self.head())
self.assertEqual((True, self.base, stamp + elapsed),
(result['applicable'], result['stable_sha'], result['observed_at']))
+ self.assertEqual(version.endswith('-rc.1'), result['new_cut'])
def test_new_minor_and_base_tag_drift_stop_activation_after_source_admission(self):
self.assemble()
@@ -261,7 +262,7 @@ class StablePatchTest(unittest.TestCase):
for observed_anchor in (anchor, {**anchor, 'draft': True}):
with mock.patch.object(patch, 'api', side_effect=[[stable], {'sha': prior}, observed_anchor]) as api, \
mock.patch.object(patch.time, 'time', return_value=stamp), self.assertRaises(ValueError):
- patch.activation_check(self.root, '6.6.2', self.head())
+ patch.activation_check(self.root, '6.6.2-rc.1', self.head())
self.assertEqual('releases/tags/v6.6.0', api.call_args.args[0])
def test_actual_activation_and_recovery_shell_refuse_before_publication_post(self):