Compare commits

...
Author SHA1 Message Date
james.maesandCodex 76eeb56083 feat: expose Voyage through the shared verification gate
Co-Authored-By: Codex <noreply@openai.com>
2026-10-21 21:57:24 -05:00
james.maesandCodex a5d10e8c1c fix: verify marketing PR branches and require concrete Node images (#119)
Co-authored-by: Codex <noreply@openai.com>
2026-10-21 21:51:20 -05:00
james.maesandCodex 4f1e5e663d fix: remove fabricated marketing coverage jobs (#117)
Co-authored-by: Codex <noreply@openai.com>
2026-10-21 21:35:10 -05:00
james.maesandCodex 898862a095 feat: centralize Node test and artifact pipelines (#115)
* feat: centralize Node test and artifact pipelines

Co-Authored-By: Codex <noreply@openai.com>

* test: supply artifact policy in fleet enrollment fixtures

Co-Authored-By: Codex <noreply@openai.com>

---------

Co-authored-by: Codex <noreply@openai.com>
2026-10-21 21:30:11 -05:00
9 changed files with 250 additions and 111 deletions

No files matched your search

+64 -7
View File
@@ -70,10 +70,12 @@ def load_manifest(path, setup_version):
if not isinstance(data, dict):
raise ManifestError("Manifest must be a mapping")
profile = data.get("profile")
if profile not in ("qbit", "core", "frontend-material", "frontend-core", "cli", "voyage", "frontend-next", "all", "app-starter", "android", "mcp-policy", "repository-policy", "marketing"):
if profile not in ("qbit", "core", "frontend-material", "frontend-core", "cli", "voyage", "frontend-next", "all", "app-starter", "android", "mcp-policy", "repository-policy", "marketing", "node-artifact"):
raise ManifestError("Unsupported profile")
allowed = ("profile", "orb_version", "default_branch", "docs_only", "publish")
if profile in ("qbit", "core"):
if profile == "node-artifact":
allowed = ("profile", "orb_version", "default_branch", "node_version", "context", "npm_scopes", "artifact_path", "build_branches")
elif profile in ("qbit", "core"):
allowed += ("java_version", "browsers", "api_checks")
if profile == "qbit":
allowed += ("release_completion", "release_on_main", "release_tag_policy", "test_branch_policy")
@@ -104,6 +106,24 @@ def load_manifest(path, setup_version):
node = data.get("node_version", "24.21" if profile == "frontend-core" else "20")
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")
branches = data.get("build_branches")
if not isinstance(context, str) or not re.fullmatch(r"[A-Za-z0-9_-]+", context):
raise ManifestError("Node artifact requires an explicit context")
if not isinstance(scopes, list) or any(not isinstance(x, str) or not re.fullmatch(r"@[a-z0-9][a-z0-9-]*", x) for x in scopes) or len(scopes) != len(set(scopes)):
raise ManifestError("Invalid npm registry scopes")
if not isinstance(artifact, str) or not re.fullmatch(r"[A-Za-z0-9_-]+(?:/[A-Za-z0-9_.-]+)+", artifact) or any(x in (".", "..") for x in artifact.split("/")):
raise ManifestError("Artifact must be a relative file path")
if not isinstance(branches, list) or not branches or any(not isinstance(x, str) or not re.fullmatch(r"[A-Za-z0-9_-]+(?:/[A-Za-z0-9_.-]+)*", x) for x in branches) or len(branches) != len(set(branches)):
raise ManifestError("Build branches must be distinct literal branch names")
return {"profile": profile, "orb_version": version, "default_branch": default_branch,
"node_version": node, "context": context, "npm_scopes": scopes,
"artifact_path": artifact, "build_branches": branches}
publish_keys = ("snapshot", "release_candidate", "release")
if profile == "all":
publish_keys = ("snapshot",)
@@ -407,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):
@@ -445,8 +474,12 @@ def next_template(config, branch, tag):
def voyage_template(config, branch, tag):
del branch, tag # This profile's reviewed static filters own its three workflows.
return json.loads(json.dumps(VOYAGE_TEMPLATE).replace("__ORB_VERSION__", config["orb_version"]))
del tag # Existing job filters retain tag exclusion and main-only release actions.
selected = "develop" if branch == "develop" else (
"release" if branch == "main" or branch.startswith("release/") else "pull-request")
result = json.loads(json.dumps(VOYAGE_TEMPLATE).replace("__ORB_VERSION__", config["orb_version"]))
result["workflows"] = {"verify": result["workflows"][selected]}
return result
def repository_policy_template(config, branch, tag):
@@ -460,6 +493,30 @@ PROFILE_TEMPLATES = {"qbit": qbit_template, "core": core_template,
"cli": cli_template, "voyage": voyage_template, "frontend-next": next_template, "all": all_template, "app-starter": starter_template, "android": android_template, "mcp-policy": policy_template, "marketing": marketing_template}
def node_artifact_template(config, branch, tag):
# One checkout/install is shared by tests and an optional artifact build.
lines = ["registry=https://registry.npmjs.org/"]
lines += [scope + ":registry=https://npm.pkg.github.com/" for scope in config["npm_scopes"]]
if config["npm_scopes"]:
lines.append("//npm.pkg.github.com/:_authToken=${NPM_TOKEN}")
npmrc = "printf '%s\\n' " + " ".join("'" + line + "'" for line in lines) + " >> .npmrc"
steps = ["checkout", {"run": {"name": "Configure npm registries", "command": npmrc}},
{"restore_cache": {"keys": ['node-artifact-npm-v1-{{ checksum "package-lock.json" }}', 'node-artifact-npm-v1-']}},
{"run": {"name": "Install locked dependencies", "command": "npm ci --prefer-offline --cache ~/.npm"}},
{"save_cache": {"key": 'node-artifact-npm-v1-{{ checksum "package-lock.json" }}', "paths": ["~/.npm"]}},
{"run": {"name": "Test project", "command": "npm test"}}]
if not tag and branch in config["build_branches"]:
steps += [{"run": {"name": "Build artifact", "command": "npm run build"}},
{"store_artifacts": {"path": config["artifact_path"], "destination": config["artifact_path"].split("/")[-1]}}]
return {"version": 2.1,
"jobs": {"node_artifact": {"docker": [{"image": "cimg/node:" + config["node_version"]}], "steps": steps}},
"workflows": {"verify": {"jobs": [{"node_artifact": {"context": [config["context"]],
"filters": {"branches": {"ignore": "automation/qbit-rc-pending"}, "tags": {"ignore": "/.*/"}}}}]}}}
PROFILE_TEMPLATES["node-artifact"] = node_artifact_template
def runtime_boolean(name):
value = os.environ.get(name, "false").lower()
if value in ("true", "1"):
+65 -8
View File
@@ -25,7 +25,7 @@ STARTER_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNp1UMGKwkAMvc9X
ANDROID_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtWG1v2zYQ/p5fQWgF6rSW3CXYMDhJ13YNkm5rkrrugKEKDFqiZCYUyZBUbC/wfvuO1LvtpmmBAcUwIYAp3vHuuXcqdzsIebdEaSq4N0R7wfd9uyPUVMPrHazhDfNYCRrDhhdRFTES0UG592Iv+CF45vULxjSSfsRoh7Hce7Ef7AV7HvCtnIYr0daQc2p8Q7Spt2CTLEiUG6Fae7DLcUasghJABcTPcDSjnJRQHKvBqeWMSYJzZrySsKo4PG2ItCA+NkeiGYmuRW7aYipNCvAJRfxU4ZgRPwKFbXUNxvaZnDu7dMeIAh1s+5HIMuC1MINBIXiOLOU1meap1zqxqterLdg0vn0YMAC0CaXy6XuQ4rQjsBVcpltSCvc0cLPrmCrkS/T3wFlSnhhc2VgOQp5QHqMA+WYpCUoQ0FOyQKEXPBlMc8ri7qngySJjoYd8G3QUSXS32i4YheFByNdxzWeEu6Rgc7zUn3VbxyMuqBOralJZveEgic3Myu9C+ho9WBma4OjhSgq7P6GqXF3utBRXObFRTxIriLOBYu9WlF5CIWQ+zXBK1lB5NnoWkzaK8rTj9rquhl0R+qACsP/sIBUiZWC1pPpg8dOP3gb0phq/kXLfWsbaQNx8kuUMA0Iftv2vquxIcE4iQ2JX3i8L6WMbp7WEXouJd3iImvAFbSp6/vzL8vDb6QDgeJnDAdz44f+G8C80hAyCyv2YSCaW/5UBe28WX+RTRvUMzamZIT3DisTorXUCimBJuKGY3ZfZmhhIvFwgSSXYRlnIh5C4j+5O3oxPP7yajM9/Oz4b/nxCzWk+RRc4urZ9D80VNaSlAlENZXSTU9hZhV7Iv0MvczOzxAgD55QkYC40hUxSBu31ALil0BScsEQ4iojWVgR0DFhhtewjLgySSogEwZ8s9JZqC/4g5FBmFNr1cpJroo4e9eTSzATfhzo5PHx88ef49PzscchpJoUy6EoLXr8IXS9zxRidBhY9BCUEnohhgHMmRgSqHnpYr8sSnI7HFxXtFPzIiNodhty6FvIDLCtIk5K/pwlL+tY9fZTIPjghJn2U6bSPZgTH0OXAWjIHJZUU+yhMNUGjHDyYkWOlhOqFXhkG3LgWLrO1Qlgk4Ik49HatGeCYUp6QhBOFjtZsDVxvmhTUXmPvbmNLSkzP1mYHWXF6U9yotDf0ZsZIPRwMYBgGKWRmPg0g9ANock+RFddvpNmndMPRXejZrBGK/uUsCz2bi68IZLVC7rDQAeG3VAn+EbzRStHQu1wTWj8gFBJGmkIalpKVjhvc8riE99Rlh7fabWS4iip8E9ifXmlmH9mIQF0f7T/bRdjmvZaCazLs6lfE5Iq7tAuYwHGv4it12JwFH1oPh559gbAFxRsTKeUuipaRJq4YqKYchjOPSM9y9xFk/i4SyhGdsHJdyHD1NXgHCeS/OR/c3Nz4RW+saqbRJonKqLafRTr0+jB9akKuZ8C2kZR/YJbXKfnWHuUpquSW1Vmjl3CbMg4xbJCFDQQ6dj+gsBRdiH3vRv3xgpom0+uG02o1EebWzLJrQCWUDa9lGUqUyKCCOQl50QdC7tS7ij8fnUxORi9f/348uRid/3r8y3hSZMG7mxsnalRK+gCobaM9gobY6TW2w32psAtoKnOhYiusm7khb65NPtymuBaMHEmGKUey6O9Okuv1ReqOxclWJaO6q8JF4SFzs/5KBWjXCRPz1qeqG8X2Auj6RHuclp+0rWHXfNbef7+sr+qfvzR8YpZXU7GYNl0Y94DZBqNDvFwbkgllGx8QJWmqoAxnZBvN/keBs6W7NEL8vDXyqvO+2pjL3JCF2WbSZgH77QHfteShgd9Z7fwDUg7law==")))
POLICY_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNqdVU1v2zAMvedXCL442Rq3aYEegubQQwYMWLGeBgxVESg2nWqVJU9S1gZB/vtIWXbsdCuw+WKJH4+PlEjtR4wlv8A6aXQyZ5fZ7IwkP8za4XaPa9ILJQvhYVoL78HqowqVhcmfwaLkIUpYpwt6WYkNoDrJZbU5r3f+yej5VTa7TDqrQ1w9nrWgFpzZ2hxWuRKOwiWuEkolnYHzULtB0CR/gvzZbH1ndELEbnWPdxRqUQVyn7XzGIDd777f3n3pQTTQpqqELsiwljWT0Xg6LaQTa4WFkfU0VnEaeESgxeI6u8iukh7c4Zj2/xD9Fs+CxbNgpVTg3iMcKn7FOL+5Yeny66eUa1nVxnq2E5XqNm7nuC6tqQj5Sck1i4p73HLNNVhrrGML9vDIdYy+ys1We5RdkEVpbMBcESesUnAdp1k6yexGmfU4/ZCRPp3MuSaesmRC78a1sD7DklrvXmT0YARGCsLpQDOSuNadvtxoL/UWKD7tvd31tATHTA163EFMmHCs7NnQhxUVmAUZZU6UsFJGFONy0qJGsmnbAOcp0XLe9nBPIC383EoLBRUslUV6xlIvvQJa5HiAG2N3tC7A5VbWHq9OUGE+oH36OESrpHNSbwisDKUpiUAXA7mVTJtQLMrlxBvVEeCEJH3NuWaixjJhzjzZdzkd5uwuBi4lqMLhtYxAB55MhljDK/FxwWZt9eA1h7q5bhl1xZIi0jFAj877NMiNroODxhCJwJFCDLAMPyzkv2Evh4B4ua3UnszaZivYfpDdYdh90Q2r3ASKkRsYnnCul03vlOhczDvadI6hTwZuR1dkwNh0kCl2aQav0o9nKADl4CTWLY6l9pKyMLeDK7Y913+ZQu3wHbW7MJeSF2OfS2Ve/vAO9Md/fCl6c/jta/E2wugw+g3AlOQ8")))
REPOSITORY_POLICY_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNqdVltv2zYUfs+vIPwiGYjotgGGIa0fis7YAnRO0HgtgigwaOnIZkKRGkkl9gL/951DXSK7aDNML+K56ON3bqSeTxgbPYJ10ujROXvH356S5t6sHIrPuCa7UDIXHpLKKJntegOacpM9gEXNbathvS3YZSnWgOZRJsv1pNr5jdHnZ/ztu1HvtW9Xd6cdqAVnapvBMlPCEY+RK4VSo97BeajcwaajbAPZg6l973RExNZ6wLtValEGchfaedyA+Q2wm49/fmaVsA7DOj10z0xZCp3TF00kZywpWSUrJluAJMmlEyuFqZJV0uY1CdzY1Y6gp9Nf+Bt+Nhog719S8X/If22rE9iLqsISCU/bFhaArazQ2eY/RJKmHz5EVzeLPy7nUaplWRnr2b0zOtWFNRim8BslV6y1XKHYu7l6VVmTgXO9alsqDh4Z8JmCErRfEBvh2GzR++xEqVLEJ2jHpgMYHlK2xHpWtY9vo7X00SmLlEsKqcDROvknuhvzHDKTQxzVvkh+jcbcYfg+jtL0TTR+Ab4ltjElbMwKYxmtsGasscsiKO6QF66Mb9TnqaZUWSEdsOsdtlw52xL23DBvBbZ9zpp5YA0n3I9gaL/n6PPFp9n8ekZE55cLFGj16fLq5mL+e7P8bXb5bT77ck0Sx/jkWhsLnSS8t3JVe4q1IRKeiEMuvbGZ0YVck3P5qJ+6N8/KPNqn2tVFIbctE446ArUupJD7bfMWOLphsStV8xbtgooeFliMCqyXSAJRsWFkAc43sJUp+bb5oMJk4JT332XCrg33prXuEOYeMt9r0Fia/CCuENuqlirnaytyFfIwlPmDD1V34L3UazdwO1IFT6RLdaZC9nVuC4o1JpFLt3QYutQP8Zi1vpwKyJV5AotK/LCP+fyF7HcdUUQfX6aOoFpcZuHvWuJhxgQLsTDMBPUKjjLttqeWGVISblkZJ7e493SK+ceaTp4sjjTYSSkeQSetxO+FjQaUsB0wBTX8FC6MlPM7BZOmfUL9BiizBadJd9h5eh0HCAsiX3rY+hg0Dhrqp92ojV/bPgwZjRPmsRkMPHEaU9OgfaJbp65tf57rv7C9Kzo+DufvPXOgsMteyzUFgw38WnSHoRzxRa7x0dyMB6SVdD4mLXeigKUyuAteDjHt1KUN1A+wQ+HDJA0QSeaE4xoQPNmwRpSN7vDP2bMCHYrmxvujA2qCo17TGdx0aDiu3mPWh7dFmzUahHrVKSkPzZWQ6h/cWN3lfdJJ4Q4bPRn7UGBMw78IsLI4+Hlo/zIGt/jxn8b36Cf7k38B2PmvaA==")))
MARKETING_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtW89v4ygUvuevQD7MSKsSp5lbD6OR9rRa7W1uk8oiGMc0GFzATbNV/vd9+EeaOHaqVpt6knBpbfh4wHufee9z3ZcRQsET04YrGdyh6fj2xrUoPTdw+wLXcJcVkluloSFYqmQ6DeuGH5Pxt/HtbQCoTTlspfQyEWq1MzbXmKaMLl+boPFBleZ/1fdo27M7XShVzKJ5wUUcERlHlhm7Y6QGS5Ixt7AShwGHS9xNC+VMvW4zmE7biJzQJVmwKCMSfpV7lXnWRjnbEVUZoGK3g+DXzMGQLiQSXNpZcINeW8o1NU3PKBdkvdJ8kVrEpbFECERTrTJeZAjjFbcpjllu9m24Ge8a2H6XcKZSVRg2C+7bK6VKWvZs97xcdy1gpmIe7DXft4YnXFhw14G/oWuuiYSQdvU55kix7pi07AsTRmyh2WwWjv8IWytuMKmyCX+uIQeI+1bLZtR393q9uTnOs1jRJdORoUT284tnQAtcYlquKnuiBpcRvWSWywVesbnhlrXhmi24sdo5KVikVI+5Ch8hnJirQ+hjwTUzXUFs8d0Hsw6mYVQza96IZo3qjOdVeYvAefaGqwDS7SfCRaRklHAZA9/L4zAhwrBrdmiZaKj78VgQwe2637EOhRvUifKVP0E+HELwPjj2WPhqxIlCl3G5u4pgcpjhq87IKiUc4qGj8NmCTAFFi15HObHp7vLD5gLXiPGDUbLXTF37lJluGXONcI6aTvTlC2I0VejryyywCgqcWXAHl1AYMVNd5hRKpLvbyWSz2XxF39H7VuHZ/EE2Q7orNBwzb2fFEtZ53Psj6YRBHO2OrUMaxOyJCZV74XRNwmkb9YusjU+6u3OoZU/pAF97DuVyXyv6WnEo9vna7nOdXr8trMqrvDBpv88rKK52XkI/7dVhyoiw6fYJDvv6lXaVTvBtMpn0QOJ5bzI8Fu4jGQb1HojoaPWB+hM4ahP8KL2OlXjg1t+Ym506ASriBbDG64Sr0glN1C9TJ5xyd2ehE07oAK8ThnK51wleJwzFPq8TPtfpXid4nTAYNzt1gmaCEcMw7DvmMbHMKwb/SVZNCv+JzjCuON/vbwbwlhcuZxEfr3K8yjkLqnpJ9BtHyOsnr58ugshVbR/VM/ezuMLhBvcODhzy/8NhuSgd0qmCc63igtrquPby93r+YJYRLv2LvsES1XuKmGFfvJ2KKEXuXrpFNIZckKt+llQ4TGNc4tq+2Q4P/lbJzxWTdv1zpUIqCgP7xvAsqdy0RzH5xLWSGaDdSHcIdhhOlM5ICViCMXjA/2UdqH2StngXvklasNCw0DJJpDXl2LCGh83UxJ3R4zXJxIEFHsEuIwaBKuUb5T+chfEh62tks9Z/qkigP/+63PR6Mvr6Oub/cvR+XeL+e3q0Gf0Hgnpc+w==")))
MARKETING_TEMPLATE = json.loads(zlib.decompress(base64.b64decode("eNrtW8Fu4jAUvPMVUY4rTCi99bTSnlarvfVWqsgkDvHi2KntlLIV/77PTlIgJKBWm1LAl5bY42d73uR5EsTrwPP8ZyIVFdy/8yajm6FpEXKm4PIVPsNVVnCqhYQGfyGSySSoGr6PR7ejmxsfUGs7bCnkImFiuTU2lyhKSbTYNEHjH2HDP1TX3lvP9nQBFzEJZwVlcYh5HGqi9FaQCsxxRszCLA4BDlncsIEyoTbb9CeTJiLH0QLPSZhhDv/sXnmeNVEmdhiJDFCx2YH/MDUwTxbcY5TrqT/0Ni12TXXTi5czvFpKOk+1R7nSmDEvSqXIaJF5CC2pTlFMcrUbw8x4V8N2u5gJlYpCkan/2FxpJLgmL3qH5aprDjMVM3+n+bExPKFMA117fEPXTGIOKW3rM8rhbNUyqe0LEoJ1Icl0Goy+BY0V15hU6IS+VJA9xGOjZT3outp8Xg8P6ywW0YLIUEWYd+uLZiALZDENqmxPWOMyLBdEUz5HSzJTVJMmXJI5VVoakvx5GskRFcETpBNRsQ99Kqgkqi2JDb27ZFbJVCSSRKsj2axQrfm8KrYw1LMjVAGknSdMWSh4mFAeg95tOUwwU+SaCbUHTWT+PBWYUb3qJtagUI3q6bxyFeSDKYQCUUhIzPE6YmGtN4hLYo9JHGyPrVLqx+SZMJE7q3lNVvMt6xfpJnrd3Tmc/n0S4E7r01DuTtfPJb16wi0PuLxQaTfnJRSVO7fQT3vcTQlmOg1zrM36/KCrX0hz1vi34/G4AxLPOsvRoXQfuMe9g1Xe6y6UXlPGB0V06CgF8r6wAlv9GDiPOWjD+bGr8mN11i/Tj/W5u7PwYz0S4PzYaSh3fuxzSXd+zPmxnhXY6sckYQQrgmDfMY2xJs6ZuS9lK1G4L+lOQ8X5fgN3AracQTyD/Dg3+YUz5Kyns55nJNfSFoXVzN1aLXGoxr0j0/sq/3BaLsrCtT5A5FLERaTLouyeHK7nnW6GKXdvQk52HL3Hqpz2nUVfQily874ijGI4C3LRrZISh6IYWVyTm7fh/i+R3C8J16v7pQgiVijYN4J7SeSqOYrwZyoFzwBtRpoi2BI4ETLDFrCAYHCD/yUtqF2RNnQXHBUtRKhVqAnHXCs7NqjgQT01NjV6tMIZ24tAQ9hlSCBRzD4n0e8mwmhf9RWyXuvvMhPej5+Xe7z2Jl/nY/4X0bu+xPz0ZLAe/APdOacY")))
class ManifestError(ValueError):
@@ -70,10 +70,12 @@ def load_manifest(path, setup_version):
if not isinstance(data, dict):
raise ManifestError("Manifest must be a mapping")
profile = data.get("profile")
if profile not in ("qbit", "core", "frontend-material", "frontend-core", "cli", "voyage", "frontend-next", "all", "app-starter", "android", "mcp-policy", "repository-policy", "marketing"):
if profile not in ("qbit", "core", "frontend-material", "frontend-core", "cli", "voyage", "frontend-next", "all", "app-starter", "android", "mcp-policy", "repository-policy", "marketing", "node-artifact"):
raise ManifestError("Unsupported profile")
allowed = ("profile", "orb_version", "default_branch", "docs_only", "publish")
if profile in ("qbit", "core"):
if profile == "node-artifact":
allowed = ("profile", "orb_version", "default_branch", "node_version", "context", "npm_scopes", "artifact_path", "build_branches")
elif profile in ("qbit", "core"):
allowed += ("java_version", "browsers", "api_checks")
if profile == "qbit":
allowed += ("release_completion", "release_on_main", "release_tag_policy", "test_branch_policy")
@@ -104,6 +106,24 @@ def load_manifest(path, setup_version):
node = data.get("node_version", "24.21" if profile == "frontend-core" else "20")
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")
branches = data.get("build_branches")
if not isinstance(context, str) or not re.fullmatch(r"[A-Za-z0-9_-]+", context):
raise ManifestError("Node artifact requires an explicit context")
if not isinstance(scopes, list) or any(not isinstance(x, str) or not re.fullmatch(r"@[a-z0-9][a-z0-9-]*", x) for x in scopes) or len(scopes) != len(set(scopes)):
raise ManifestError("Invalid npm registry scopes")
if not isinstance(artifact, str) or not re.fullmatch(r"[A-Za-z0-9_-]+(?:/[A-Za-z0-9_.-]+)+", artifact) or any(x in (".", "..") for x in artifact.split("/")):
raise ManifestError("Artifact must be a relative file path")
if not isinstance(branches, list) or not branches or any(not isinstance(x, str) or not re.fullmatch(r"[A-Za-z0-9_-]+(?:/[A-Za-z0-9_.-]+)*", x) for x in branches) or len(branches) != len(set(branches)):
raise ManifestError("Build branches must be distinct literal branch names")
return {"profile": profile, "orb_version": version, "default_branch": default_branch,
"node_version": node, "context": context, "npm_scopes": scopes,
"artifact_path": artifact, "build_branches": branches}
publish_keys = ("snapshot", "release_candidate", "release")
if profile == "all":
publish_keys = ("snapshot",)
@@ -407,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):
@@ -445,8 +474,12 @@ def next_template(config, branch, tag):
def voyage_template(config, branch, tag):
del branch, tag # This profile's reviewed static filters own its three workflows.
return json.loads(json.dumps(VOYAGE_TEMPLATE).replace("__ORB_VERSION__", config["orb_version"]))
del tag # Existing job filters retain tag exclusion and main-only release actions.
selected = "develop" if branch == "develop" else (
"release" if branch == "main" or branch.startswith("release/") else "pull-request")
result = json.loads(json.dumps(VOYAGE_TEMPLATE).replace("__ORB_VERSION__", config["orb_version"]))
result["workflows"] = {"verify": result["workflows"][selected]}
return result
def repository_policy_template(config, branch, tag):
@@ -460,6 +493,30 @@ PROFILE_TEMPLATES = {"qbit": qbit_template, "core": core_template,
"cli": cli_template, "voyage": voyage_template, "frontend-next": next_template, "all": all_template, "app-starter": starter_template, "android": android_template, "mcp-policy": policy_template, "marketing": marketing_template}
def node_artifact_template(config, branch, tag):
# One checkout/install is shared by tests and an optional artifact build.
lines = ["registry=https://registry.npmjs.org/"]
lines += [scope + ":registry=https://npm.pkg.github.com/" for scope in config["npm_scopes"]]
if config["npm_scopes"]:
lines.append("//npm.pkg.github.com/:_authToken=${NPM_TOKEN}")
npmrc = "printf '%s\\n' " + " ".join("'" + line + "'" for line in lines) + " >> .npmrc"
steps = ["checkout", {"run": {"name": "Configure npm registries", "command": npmrc}},
{"restore_cache": {"keys": ['node-artifact-npm-v1-{{ checksum "package-lock.json" }}', 'node-artifact-npm-v1-']}},
{"run": {"name": "Install locked dependencies", "command": "npm ci --prefer-offline --cache ~/.npm"}},
{"save_cache": {"key": 'node-artifact-npm-v1-{{ checksum "package-lock.json" }}', "paths": ["~/.npm"]}},
{"run": {"name": "Test project", "command": "npm test"}}]
if not tag and branch in config["build_branches"]:
steps += [{"run": {"name": "Build artifact", "command": "npm run build"}},
{"store_artifacts": {"path": config["artifact_path"], "destination": config["artifact_path"].split("/")[-1]}}]
return {"version": 2.1,
"jobs": {"node_artifact": {"docker": [{"image": "cimg/node:" + config["node_version"]}], "steps": steps}},
"workflows": {"verify": {"jobs": [{"node_artifact": {"context": [config["context"]],
"filters": {"branches": {"ignore": "automation/qbit-rc-pending"}, "tags": {"ignore": "/.*/"}}}}]}}}
PROFILE_TEMPLATES["node-artifact"] = node_artifact_template
def runtime_boolean(name):
value = os.environ.get(name, "false").lower()
if value in ("true", "1"):
-84
View File
@@ -88,28 +88,6 @@
}
}
},
{
"munitor/node_coverage": {
"name": "coverage",
"node_version": "22",
"package_manager": "npm",
"min_coverage": "0",
"coverage_tool": "jest",
"coverage_summary_path": "coverage/coverage-summary.json",
"coverage_command": "mkdir -p coverage && echo '{\"total\":{\"lines\":{\"pct\":100}}}' > coverage/coverage-summary.json",
"requires": [
"build-and-test"
],
"filters": {
"branches": {
"only": [
"/feature\\/.*/",
"/hotfix\\/.*/"
]
}
}
}
},
{
"munitor/node_security_scan": {
"name": "security-scan",
@@ -184,25 +162,6 @@
}
}
},
{
"munitor/node_coverage": {
"name": "coverage",
"node_version": "22",
"package_manager": "npm",
"min_coverage": "0",
"coverage_tool": "jest",
"coverage_summary_path": "coverage/coverage-summary.json",
"coverage_command": "mkdir -p coverage && echo '{\"total\":{\"lines\":{\"pct\":100}}}' > coverage/coverage-summary.json",
"requires": [
"build-and-test"
],
"filters": {
"branches": {
"only": "develop"
}
}
}
},
{
"munitor/node_security_scan": {
"name": "security-scan",
@@ -228,7 +187,6 @@
"health_db": "false",
"requires": [
"code-quality",
"coverage",
"secrets-scan",
"sast-scan",
"security-scan"
@@ -299,25 +257,6 @@
}
}
},
{
"munitor/node_coverage": {
"name": "coverage",
"node_version": "22",
"package_manager": "npm",
"min_coverage": "0",
"coverage_tool": "jest",
"coverage_summary_path": "coverage/coverage-summary.json",
"coverage_command": "mkdir -p coverage && echo '{\"total\":{\"lines\":{\"pct\":100}}}' > coverage/coverage-summary.json",
"requires": [
"build-and-test"
],
"filters": {
"branches": {
"only": "staging"
}
}
}
},
{
"munitor/node_security_scan": {
"name": "security-scan",
@@ -343,7 +282,6 @@
"health_db": "false",
"requires": [
"code-quality",
"coverage",
"secrets-scan",
"sast-scan",
"security-scan"
@@ -422,27 +360,6 @@
}
}
},
{
"munitor/node_coverage": {
"name": "coverage",
"node_version": "22",
"package_manager": "npm",
"min_coverage": "0",
"coverage_tool": "jest",
"coverage_summary_path": "coverage/coverage-summary.json",
"coverage_command": "mkdir -p coverage && echo '{\"total\":{\"lines\":{\"pct\":100}}}' > coverage/coverage-summary.json",
"requires": [
"build-and-test"
],
"filters": {
"branches": {
"only": [
"/release\\/.*/"
]
}
}
}
},
{
"munitor/node_security_scan": {
"name": "security-scan",
@@ -470,7 +387,6 @@
"health_db": "false",
"requires": [
"code-quality",
"coverage",
"secrets-scan",
"sast-scan",
"security-scan"
+3
View File
@@ -47,6 +47,7 @@ PROFILE_PARAMETERS = {
"mcp-policy": {},
"repository-policy": {},
"marketing": {},
"node-artifact": {},
}
@@ -66,6 +67,8 @@ def canonical_caller(profile, version, explicit_manifest=False, release_tag_poli
"orb_version": version,
"filters": {"branches": {"ignore": "automation/qbit-rc-pending"}, "tags": {"only": "/.*/"}},
}
if profile == "node-artifact":
options["filters"]["tags"] = {"ignore": "/.*/"}
if profile == "frontend-next":
options["filters"]["branches"] = {"ignore": "/.*/"}
if profile == "qbit" and release_tag_policy is not None:
+3
View File
@@ -29,6 +29,9 @@ class EnrollmentTests(unittest.TestCase):
target = self.legacy(profile)
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'], 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(
enrollment.rollout.standard.canonical_caller(profile, '0.7.4')), encoding='utf-8')
+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'] = 'unknown-profile'
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'])
+110 -10
View File
@@ -34,23 +34,45 @@ class MarketingContractTests(unittest.TestCase):
# The original delegated job never builds: require the shared profile
# to prepare the standalone artifact before browser/Lighthouse checks.
for workflow in baseline["workflows"].values():
# Omit the legacy zero-threshold job that fabricated 100% coverage.
workflow["jobs"] = [job for job in workflow["jobs"] if "munitor/node_coverage" not in job]
for job in workflow["jobs"]:
options = next(iter(job.values()))
if "requires" in options:
options["requires"] = [name for name in options["requires"] if name != "coverage"]
for entry in workflow["jobs"]:
if "munitor/node_build_and_test" in entry:
build = entry["munitor/node_build_and_test"]
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()), 33)
self.assertNotIn("generate_pipeline", json.dumps(result))
def test_no_fabricated_coverage_or_dangling_dependency(self):
result = pipeline.marketing_template({}, "develop", "")
self.assertNotIn("coverage-summary.json", json.dumps(result))
self.assertNotIn("munitor/node_coverage", json.dumps(result))
for workflow in result["workflows"].values():
names = {next(iter(job.values())).get("name", next(iter(job))) for job in workflow["jobs"]}
for job in workflow["jobs"]:
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")
@@ -58,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"], "/")
@@ -70,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"}
@@ -191,6 +213,65 @@ 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.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)
self.assertEqual(["verify"], list(output["workflows"]))
self.assertEqual(["node_artifact"], list(output["jobs"]))
steps = output["jobs"]["node_artifact"]["steps"]
self.assertEqual(1, steps.count("checkout"))
commands = [step["run"]["command"] for step in steps if isinstance(step, dict) and "run" in step]
self.assertEqual(1, commands.count("npm ci --prefer-offline --cache ~/.npm"))
self.assertEqual(1, commands.count("npm test"))
self.assertEqual(branch in ("main", "feature/initial-dev"), "npm run build" in commands)
artifacts = [step["store_artifacts"] for step in steps if isinstance(step, dict) and "store_artifacts" in step]
self.assertEqual(int(branch in ("main", "feature/initial-dev")), len(artifacts))
self.assertNotIn("npm publish", str(output))
self.assertIn("${NPM_TOKEN}", commands[0])
self.assertEqual({"ignore": "/.*/"}, output["workflows"]["verify"]["jobs"][0]["node_artifact"]["filters"]["tags"])
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)"}):
self.write_manifest(**{**baseline, **invalid})
self.render(ok=False)
def assert_full(self, result, workflow="test_only"):
self.assertEqual(list(result["workflows"]), ["verify"])
self.assertNotIn("docs_only", result.get("jobs", {}))
@@ -594,11 +675,30 @@ class PipelineTests(unittest.TestCase):
if PACKED:
self.assertEqual(self.render(), self.render(packed=True))
def test_voyage_selected_workflow_retains_all_filters_and_actions(self):
self.write_manifest(profile="voyage")
template = json.loads(json.dumps(pipeline.VOYAGE_TEMPLATE).replace("__ORB_VERSION__", "0.7.0"))
for packed in ([False, True] if PACKED else [False]):
for branch, selected in (("main", "release"), ("release/1", "release"),
("develop", "develop"), ("automation/enroll", "pull-request"),
("hotfix/1", "pull-request"), ("release-please--branches--main", "pull-request")):
result = self.render(packed=packed, CIRCLE_BRANCH=branch)
expected = copy.deepcopy(template)
expected["workflows"] = {"verify": expected["workflows"][selected]}
self.assertEqual(expected, result)
jobs = {next(iter(job)): next(iter(job.values())) for job in result["workflows"]["verify"]["jobs"]}
if selected == "release":
for name in ("update-cd-repo", "release-please"):
self.assertEqual({"branches": {"only": "main"}}, jobs[name]["filters"])
if selected in ("release", "develop"):
self.assertIn("sonar-scan", jobs)
self.assertEqual(["sonarcloud"], jobs["sonar-scan"]["context"])
def test_voyage_owns_complete_template(self):
self.write_manifest(profile="voyage")
result = self.render(CIRCLE_BRANCH="release/1")
self.assertEqual(len(result["jobs"]), 9)
self.assertEqual(len(result["workflows"]), 3)
self.assertEqual(list(result["workflows"]), ["verify"])
self.assertNotIn("__ORB_VERSION__", json.dumps(result))
self.assertEqual(result["orbs"]["qqq-orb"], "kingsrook/qqq-orb@0.7.0")
if PACKED:
@@ -619,7 +719,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"))
+3
View File
@@ -20,6 +20,9 @@ class RolloutTests(unittest.TestCase):
def checkout(self, name, profile='qbit', explicit=False, **policy):
root = self.root / name
(root / '.circleci').mkdir(parents=True)
if profile == 'node-artifact':
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,
release_tag_policy=manifest.get('release_tag_policy'))
+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')}
'qbit', 'core', 'frontend-core', 'frontend-material', 'repository-policy', 'node-artifact', 'marketing', 'voyage')}
PROFILE_GATES.update({'all': 'verify-and-smoke', 'cli': 'test_only',
'app-starter': 'test_only', 'android': 'test-and-build',
'mcp-policy': 'validate'})