oleks/ci-scripts
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Generator: explicit-clone matrix variant + raw header/comment fields for single kind (oleks/ci-scripts#2)

Browse Source
This commit is contained in:
repo-worker
2026-07-04 19:30:12 +03:00
parent 7fbf3431ad
commit db971954d6
8 changed files with 231 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generator/render.py
+69 -3
View File
@@ -41,6 +41,9 @@ def load_template(*parts):
def render_matrix(manifest: dict) -> dict:
if manifest.get("explicit_clone"):
return render_matrix_explicit_clone(manifest)
arches = manifest["arches"]
image = manifest["image"]
script = manifest.get("script", "ci/local.sh")
@@ -87,6 +90,57 @@ def render_matrix(manifest: dict) -> dict:
return {"build.yaml": build, "manifest.yaml": mnf}
def render_matrix_explicit_clone(manifest: dict) -> dict:
"""Variant for repos that keep a Dockerfile + explicit clone + a fixed
(non-templated) `labels: arch:` and pin a specific node, e.g. csi-s3.
Selected by `explicit_clone: true` in the manifest."""
arches = manifest["arches"]
image = manifest["image"]
script = manifest.get("script", "ci/local.sh")
var_name = manifest.get("var_name", "ARCH")
buildkit_prefix = manifest.get("buildkit_prefix", "buildkit")
git_host = manifest.get("git_host", "git.oleks.space")
fixed_label = manifest["fixed_label"]
node_selector = manifest["node_selector"]
timeout = manifest.get("timeout")
manifest_arches_env = manifest.get("manifest_arches_env", " ".join(arches))
manifest_buildkit_addr = manifest["manifest_buildkit_addr"]
build_header = manifest["build_header"].rstrip("\n")
manifest_header = manifest["manifest_header"].rstrip("\n")
arch_lines = [f" - {a}" for a in arches]
for extra in manifest.get("commented_arches", []):
arch_lines.append(f" # - {extra}")
arch_list = "\n".join(arch_lines)
timeout_block = f"\ntimeout: {timeout}\n" if timeout else ""
lines = "\n".join(f" {k}: {v}" for k, v in node_selector.items())
node_selector_block = f" nodeSelector:\n{lines}\n"
build = load_template("matrix", "build-explicit-clone.yaml.tmpl").format(
fixed_label=fixed_label,
git_host=git_host,
timeout_block=timeout_block,
header=build_header,
var_name=var_name,
arch_list=arch_list,
image=image,
buildkit_prefix=buildkit_prefix,
script=script,
node_selector_block=node_selector_block,
)
mnf = load_template("matrix", "manifest-explicit-clone.yaml.tmpl").format(
fixed_label=fixed_label,
script=script,
header=manifest_header,
image=image,
manifest_buildkit_addr=manifest_buildkit_addr,
manifest_arches_env=manifest_arches_env,
node_selector_block=node_selector_block,
)
return {"build.yaml": build, "manifest.yaml": mnf}
def render_split(manifest: dict) -> dict:
repo = manifest["repo"]
git_host = manifest.get("git_host", "git.oleks.space")
@@ -113,12 +167,20 @@ def render_split(manifest: dict) -> dict:
return out
def _comment_block(text, indent):
if not text:
return ""
lines = text.rstrip("\n").splitlines()
return "".join(f"{indent}# {line}\n" if line else f"{indent}#\n" for line in lines)
def render_single(manifest: dict) -> dict:
repo = manifest["repo"]
arch = manifest["arch"]
git_host = manifest.get("git_host", "git.oleks.space")
branches = "[" + ", ".join(manifest["branches"]) + "]"
buildkit_addr = f"tcp://buildkit-{arch}.infra.svc.cluster.local:1234"
header = manifest["header"].rstrip("\n") + "\n"
label_lines = _comment_block(manifest.get("label_comment", ""), " ") + f" arch: {arch}"
step_tmpl = load_template("single", "COMPONENT_STEP.tmpl")
steps = []
@@ -126,19 +188,23 @@ def render_single(manifest: dict) -> dict:
command = f"./ci/local.sh --arch {arch}"
if c.get("component"):
command += f" --component {c['component']}"
step_comment = _comment_block(c.get("step_comment", ""), " ")
steps.append(
step_tmpl.format(
step_comment=step_comment,
step_name=c["name"],
image=manifest["image"],
buildkit_comment=_comment_block(c.get("buildkit_comment", ""), " "),
buildkit_addr=buildkit_addr,
version_comment=_comment_block(c.get("version_comment", ""), " "),
command=command,
arch=arch,
memory=c.get("memory", "4Gi"),
)
)
container = load_template("single", "container.yaml.tmpl").format(
repo=repo,
arch=arch,
header=header,
label_lines=label_lines,
branches=branches,
git_host=git_host,
component_steps="\n".join(steps),