Compare commits

...
Author SHA1 Message Date
james.maesandCodex 3908a80615 fix: verify marketing PR branches and require concrete Node images
Co-Authored-By: Codex <noreply@openai.com>
2026-10-21 21:48:06 -05:00
7 changed files with 79 additions and 21 deletions

No files matched your search

+14 -3
View File
@@ -107,6 +107,8 @@ def load_manifest(path, setup_version):
if not isinstance(node, str) or not re.fullmatch(r"\d+(?:\.\d+){0,2}", node):
raise ManifestError("node_version must be an explicit numeric version string")
if profile == "node-artifact":
if "node_version" not in data or not re.fullmatch(r"\d+\.\d+(?:\.\d+)?", node):
raise ManifestError("Node artifact requires an explicit minor or patch image version")
context = data.get("context", "")
scopes = data.get("npm_scopes", [])
artifact = data.get("artifact_path")
@@ -425,9 +427,18 @@ def cli_template(config, branch, tag):
def marketing_template(config, branch, tag):
del config, branch, tag
# One final continuation; Munitor supplies jobs, never another setup pipeline.
return copy.deepcopy(MARKETING_TEMPLATE)
del config
# Select the existing branch policy once; automation PRs use normal PR checks.
selected = {"main": "production", "develop": "develop", "staging": "staging"}.get(
branch, "release-candidate" if branch.startswith("release/") else "pr-checks")
result = copy.deepcopy(MARKETING_TEMPLATE)
workflow = result["workflows"][selected]
for job in workflow["jobs"]:
next(iter(job.values()))["filters"] = {
"branches": {"ignore": "/.*/" if tag else "automation/qbit-rc-pending"},
"tags": {"ignore": "/.*/"}}
result["workflows"] = {"verify": workflow}
return result
def android_template(config, branch, tag):
+14 -3
View File
@@ -107,6 +107,8 @@ def load_manifest(path, setup_version):
if not isinstance(node, str) or not re.fullmatch(r"\d+(?:\.\d+){0,2}", node):
raise ManifestError("node_version must be an explicit numeric version string")
if profile == "node-artifact":
if "node_version" not in data or not re.fullmatch(r"\d+\.\d+(?:\.\d+)?", node):
raise ManifestError("Node artifact requires an explicit minor or patch image version")
context = data.get("context", "")
scopes = data.get("npm_scopes", [])
artifact = data.get("artifact_path")
@@ -425,9 +427,18 @@ def cli_template(config, branch, tag):
def marketing_template(config, branch, tag):
del config, branch, tag
# One final continuation; Munitor supplies jobs, never another setup pipeline.
return copy.deepcopy(MARKETING_TEMPLATE)
del config
# Select the existing branch policy once; automation PRs use normal PR checks.
selected = {"main": "production", "develop": "develop", "staging": "staging"}.get(
branch, "release-candidate" if branch.startswith("release/") else "pr-checks")
result = copy.deepcopy(MARKETING_TEMPLATE)
workflow = result["workflows"][selected]
for job in workflow["jobs"]:
next(iter(job.values()))["filters"] = {
"branches": {"ignore": "/.*/" if tag else "automation/qbit-rc-pending"},
"tags": {"ignore": "/.*/"}}
result["workflows"] = {"verify": workflow}
return result
def android_template(config, branch, tag):
+1 -1
View File
@@ -30,7 +30,7 @@ class EnrollmentTests(unittest.TestCase):
root = Path(target['checkout'])
data = {'profile': profile, 'orb_version': '0.7.4', 'default_branch': 'main'}
if profile == 'node-artifact':
data.update(context='registry', npm_scopes=['@example'],
data.update(context='registry', npm_scopes=['@example'], node_version='20.19',
artifact_path='dist/bundle.js', build_branches=['main'])
(root / '.qqq-ci.yml').write_text(yaml.safe_dump(data), encoding='utf-8')
(root / '.circleci/config.yml').write_text(yaml.safe_dump(
+1 -1
View File
@@ -83,7 +83,7 @@ class FinishTests(unittest.TestCase):
enforce.assert_called_once_with(current)
def test_unknown_gate_profile_never_merges_or_enforces(self):
self.plan['profile'] = 'marketing'
self.plan['profile'] = 'voyage'
with mock.patch.object(finish.remote, 'command') as command, mock.patch.object(finish.enforcement, 'inspect') as inspect:
self.assertEqual('unsupported-gates', finish.merge_ready(self.plan, self.result)['state'])
self.assertEqual('unsupported-gates', finish.enforce_current(self.plan)['state'])
+47 -11
View File
@@ -46,12 +46,18 @@ class MarketingContractTests(unittest.TestCase):
build["test_commands"] = json.dumps([
"npm run lint", "npm run build",
*json.loads(build["test_commands"])])
for branch in ("feature/example", "main", "develop", "staging", "release/1"):
for branch, selected in (("feature/example", "pr-checks"), ("main", "production"),
("develop", "develop"), ("staging", "staging"),
("release/1", "release-candidate"), ("automation/enroll", "pr-checks")):
result = pipeline.marketing_template({}, branch, "")
self.assertEqual(result, baseline)
expected = copy.deepcopy(baseline)
workflow = expected["workflows"][selected]
for job in workflow["jobs"]:
next(iter(job.values()))["filters"] = {"branches": {"ignore": "automation/qbit-rc-pending"}, "tags": {"ignore": "/.*/"}}
expected["workflows"] = {"verify": workflow}
self.assertEqual(result, expected)
self.assertNotIn("setup", result)
self.assertEqual(result["orbs"], {"munitor": "kof22/munitor@0.3.11"})
self.assertEqual(sum(len(w["jobs"]) for w in result["workflows"].values()), 29)
self.assertNotIn("generate_pipeline", json.dumps(result))
def test_no_fabricated_coverage_or_dangling_dependency(self):
@@ -64,8 +70,9 @@ class MarketingContractTests(unittest.TestCase):
self.assertTrue(set(next(iter(job.values())).get("requires", [])) <= names)
def test_production_deployment_and_actual_test_contracts(self):
result = pipeline.marketing_template({}, "main", "")
for name, workflow in result["workflows"].items():
for branch in ("main", "develop", "staging", "release/1", "automation/enroll"):
result = pipeline.marketing_template({}, branch, "")
workflow = result["workflows"]["verify"]
jobs = {next(iter(entry)): next(iter(entry.values())) for entry in workflow["jobs"]}
build = jobs["munitor/node_build_and_test"]
self.assertEqual(build["node_version"], "22")
@@ -73,11 +80,11 @@ class MarketingContractTests(unittest.TestCase):
"npm run lint", "npm run build",
"npx playwright install chromium --with-deps",
"npm run test:chromium", "npm run lighthouse"])
if name == "production":
if branch == "main":
cd = jobs["munitor/update_cd_repo"]
self.assertEqual(cd["cd_repo"], "KofTwentyTwo/cluster-gitops")
self.assertEqual(cd["cd_path"], "tenants/qrun/website/kustomization.yaml")
self.assertEqual(cd["filters"], {"branches": {"only": "main"}})
self.assertEqual(cd["filters"]["tags"], {"ignore": "/.*/"})
self.assertEqual(cd["requires"], ["docker-build-push"])
self.assertEqual(jobs["munitor/github_release"]["requires"], ["docker-build-push"])
self.assertEqual(jobs["munitor/docker_build_push"]["health_path"], "/")
@@ -85,7 +92,7 @@ class MarketingContractTests(unittest.TestCase):
else:
self.assertNotIn("munitor/update_cd_repo", jobs)
result["workflows"].clear()
self.assertEqual(len(pipeline.marketing_template({}, "main", "")["workflows"]), 5)
self.assertEqual(list(pipeline.marketing_template({}, "main", "")["workflows"]), ["verify"])
def test_marketing_manifest_rejects_custom_policy_and_wrong_branch(self):
data = {"profile": "marketing", "orb_version": "0.7.0", "default_branch": "main"}
@@ -206,10 +213,26 @@ class PipelineTests(unittest.TestCase):
self.assertNotIn("Traceback", result.stderr)
return result
def test_marketing_branch_dispatch_source_and_packed(self):
self.write_manifest(profile="marketing", default_branch="main")
for packed in ([False, True] if PACKED else [False]):
for branch in ("main", "develop", "staging", "release/1", "feature/change", "automation/enroll"):
output = self.render(packed=packed, CIRCLE_BRANCH=branch)
self.assertEqual(["verify"], list(output["workflows"]))
jobs = output["workflows"]["verify"]["jobs"]
names = [next(iter(job)) for job in jobs]
self.assertEqual(branch == "main", "munitor/update_cd_repo" in names)
self.assertEqual(branch in ("main", "release/1"), "munitor/github_release" in names)
self.assertEqual(branch in ("main", "develop", "staging", "release/1"), "munitor/docker_build_push" in names)
self.assertIn("munitor/node_build_and_test", names)
output = self.render(packed=packed, CIRCLE_BRANCH="main", CIRCLE_TAG="v1.0.0")
for job in output["workflows"]["verify"]["jobs"]:
self.assertEqual({"branches": {"ignore": "/.*/"}, "tags": {"ignore": "/.*/"}}, next(iter(job.values()))["filters"])
def test_node_artifact_reuses_install_and_preserves_branch_artifact_policy(self):
self.write_manifest(profile="node-artifact", context="qqq-maven-registry-credentials",
npm_scopes=["@nocode-js", "@qrunio"], artifact_path="dist/q-sequential-workflow.bundle.js",
build_branches=["main", "feature/initial-dev"], node_version="20")
build_branches=["main", "feature/initial-dev"], node_version="20.19")
for packed in ([False, True] if PACKED else [False]):
for branch in ("main", "develop", "feature/initial-dev", "feature/change"):
output = self.render(packed=packed, CIRCLE_BRANCH=branch)
@@ -227,9 +250,22 @@ class PipelineTests(unittest.TestCase):
self.assertIn("${NPM_TOKEN}", commands[0])
self.assertEqual({"ignore": "/.*/"}, output["workflows"]["verify"]["jobs"][0]["node_artifact"]["filters"]["tags"])
def test_node_artifact_rejects_commands_paths_and_branch_regex(self):
def test_node_artifact_requires_explicit_minor_or_patch_image(self):
baseline = {"profile": "node-artifact", "context": "registry", "npm_scopes": [],
"artifact_path": "dist/bundle.js", "build_branches": ["main"]}
for packed in ([False, True] if PACKED else [False]):
for version in (None, "20", "22"):
self.write_manifest(**baseline, **({"node_version": version} if version else {}))
result = self.render(packed=packed, ok=False)
self.assertIn("explicit minor or patch", result.stderr)
for version in ("20.19", "20.19.0"):
self.write_manifest(**baseline, node_version=version)
result = self.render(packed=packed)
self.assertEqual("cimg/node:" + version, result["jobs"]["node_artifact"]["docker"][0]["image"])
def test_node_artifact_rejects_commands_paths_and_branch_regex(self):
baseline = {"profile": "node-artifact", "context": "registry", "npm_scopes": [], "node_version": "20.19",
"artifact_path": "dist/bundle.js", "build_branches": ["main"]}
for invalid in ({"artifact_path": "dist/../secret"}, {"artifact_path": "/etc/passwd"},
{"build_branches": ["/.*/"]}, {"npm_scopes": ["@scope;echo bad"]},
{"publish": {"release": True}}, {"context": "$(echo bad)"}):
@@ -664,7 +700,7 @@ class PipelineTests(unittest.TestCase):
def test_marketing_source_and_packed_parity(self):
self.write_manifest(profile="marketing", default_branch="main")
result = self.render(CIRCLE_BRANCH="main")
self.assertEqual(result, pipeline.MARKETING_TEMPLATE)
self.assertEqual(result, pipeline.marketing_template({}, "main", ""))
if PACKED:
self.assertEqual(result, self.render(packed=True, CIRCLE_BRANCH="main"))
+1 -1
View File
@@ -21,7 +21,7 @@ class RolloutTests(unittest.TestCase):
root = self.root / name
(root / '.circleci').mkdir(parents=True)
if profile == 'node-artifact':
policy = {'context': 'registry', 'npm_scopes': ['@example'],
policy = {'context': 'registry', 'npm_scopes': ['@example'], 'node_version': '20.19',
'artifact_path': 'dist/bundle.js', 'build_branches': ['main'], **policy}
manifest = {'profile': profile, 'orb_version': '0.7.4', 'default_branch': 'develop', **policy}
caller = rollout.standard.canonical_caller(profile, '0.7.4', explicit_manifest=explicit,
+1 -1
View File
@@ -15,7 +15,7 @@ standard = importlib.util.module_from_spec(spec)
spec.loader.exec_module(standard)
DESIRED = [{'context': name, 'app_id': 18001} for name in ('setup', 'verify')]
PROFILE_GATES = {profile: 'verify' for profile in (
'qbit', 'core', 'frontend-core', 'frontend-material', 'repository-policy', 'node-artifact')}
'qbit', 'core', 'frontend-core', 'frontend-material', 'repository-policy', 'node-artifact', 'marketing')}
PROFILE_GATES.update({'all': 'verify-and-smoke', 'cli': 'test_only',
'app-starter': 'test_only', 'android': 'test-and-build',
'mcp-policy': 'validate'})