Merge pull request #962 from jiridanek/jd_sandboxed_tekton_pipelines

RHOAIENG-18400: chore(.tekton/): implement computation of `"pipelinesascode.tekton.dev/on-cel-expression"` values

Author: openshift-merge-bot[bot]

.tekton/jupyter-minimal-ubi9-python-3-11-pull-request.yaml

@@ -10,7 +10,11 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: '3'
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && has(body.repository) && body.repository.full_name == "opendatahub-io/notebooks"
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( "jupyter/minimal/ubi9-python-3.11/Pipfile.lock".pathChanged()
+      || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/utils/***".pathChanged()
+      || ".tekton/jupyter-minimal-ubi9-python-3-11-pull-request.yaml".pathChanged()
+      || "jupyter/minimal/ubi9-python-3.11/Dockerfile.cpu".pathChanged() ) && has(body.repository)
+      && body.repository.full_name == "opendatahub-io/notebooks"
   creationTimestamp:
   labels:
     appstudio.openshift.io/application: notebooks

ci/cached-builds/konflux_generate_component_build_pipelines.py

@@ -2,10 +2,15 @@
 
 import re
 import pathlib
+
 import yaml
 
 import gen_gha_matrix_jobs
 import gha_pr_changed_files
+import scripts.sandbox
+
+# test dependencies
+import pyfakefs.fake_filesystem
 
 ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
 
@@ -21,7 +26,7 @@
 
 Usage:
 
-$ poetry run ci/cached-builds/konflux_generate_component_build_pipelines.py
+$ PYTHONPATH=. poetry run ci/cached-builds/konflux_generate_component_build_pipelines.py
 """
 
 
@@ -58,6 +63,13 @@ def component_build_pipeline(component_name, dockerfile_path, is_pr: bool = True
     This is general enough to create PR pipeline as well as push pipeline.
     """
     name = component_name + ("-on-pull-request" if is_pr else "-on-push")
+    files_changed_cel_expression = ""
+    if is_pr:
+        files_changed_cel_expression = ' || '.join((
+            compute_cel_expression(dockerfile_path),
+            f'".tekton/{component_name}-pull-request.yaml".pathChanged()',
+            f'"{dockerfile_path}".pathChanged()'
+        ))
     return {
         "apiVersion": "tekton.dev/v1",
         "kind": "PipelineRun",
@@ -71,6 +83,7 @@ def component_build_pipeline(component_name, dockerfile_path, is_pr: bool = True
                 "pipelinesascode.tekton.dev/max-keep-runs": "3",
                 "pipelinesascode.tekton.dev/on-cel-expression": (
                     f'event == "{"pull_request" if is_pr else "push"}" && target_branch == "main"'
+                    + (' && ( ' + files_changed_cel_expression + ' )' if files_changed_cel_expression else "")
                     + ' && has(body.repository) && body.repository.full_name == "opendatahub-io/notebooks"'
                 ),
             },
@@ -761,5 +774,48 @@ def main():
                   file=yaml_file)
 
 
+def compute_cel_expression(dockerfile: pathlib.Path) -> str:
+    return cel_expression(root_dir=ROOT_DIR, files=scripts.sandbox.buildinputs(dockerfile))
+
+
+def cel_expression(root_dir: pathlib.Path, files: list[pathlib.Path]) -> str:
+    """
+    Generate a CEL expression for file change detection.
+
+    Args:
+        root_dir (pathlib.Path): Docker build context.
+        files (list[pathlib.Path]): List of file paths to check for changes.
+
+    Returns:
+        str: A CEL expression that checks if any of the given files have changed.
+    """
+    expressions = []
+    for file in files:
+        relative_path = file.relative_to(root_dir) if file.is_absolute() else file
+        if file.is_dir():
+            expressions.append(f'"{relative_path}/***".pathChanged()')
+        else:
+            expressions.append(f'"{relative_path}".pathChanged()')
+
+    return " || ".join(expressions)
+
+
 if __name__ == "__main__":
     main()
+
+
+class Tests:
+
+    def test_compute_cel_expression(self, fs: pyfakefs.fake_filesystem.FakeFilesystem):
+        fs.cwd = ROOT_DIR
+        ROOT_DIR.mkdir(parents=True)
+        pathlib.Path("a/").mkdir()
+        pathlib.Path("b/").mkdir()
+        pathlib.Path("b/c.txt").write_text("")
+
+        assert cel_expression(
+            ROOT_DIR,
+            files=[
+                pathlib.Path("a"),
+                pathlib.Path("b") / "c.txt"
+            ]) == '"a/***".pathChanged() || "b/c.txt".pathChanged()'

scripts/__init__.py

@@ -38,12 +38,7 @@ def main() -> int:
         print("must give a `{};` parameter that will be replaced with new build context")
         return 1
 
-    if not (ROOT_DIR / "bin/buildinputs").exists():
-        subprocess.check_call([MAKE, "bin/buildinputs"], cwd=ROOT_DIR)
-    stdout = subprocess.check_output([ROOT_DIR / "bin/buildinputs", str(args.dockerfile)],
-                                     text=True, cwd=ROOT_DIR)
-    prereqs = [pathlib.Path(file) for file in json.loads(stdout)] if stdout != "\n" else []
-    print(f"{prereqs=}")
+    prereqs = buildinputs(dockerfile=args.dockerfile)
 
     with tempfile.TemporaryDirectory(delete=True) as tmpdir:
         setup_sandbox(prereqs, pathlib.Path(tmpdir))
@@ -57,6 +52,16 @@ def main() -> int:
     return 0
 
 
+def buildinputs(dockerfile: pathlib.Path | str) -> list[pathlib.Path]:
+    if not (ROOT_DIR / "bin/buildinputs").exists():
+        subprocess.check_call([MAKE, "bin/buildinputs"], cwd=ROOT_DIR)
+    stdout = subprocess.check_output([ROOT_DIR / "bin/buildinputs", str(dockerfile)],
+                                     text=True, cwd=ROOT_DIR)
+    prereqs = [pathlib.Path(file) for file in json.loads(stdout)] if stdout != "\n" else []
+    print(f"{prereqs=}")
+    return prereqs
+
+
 def setup_sandbox(prereqs: list[pathlib.Path], tmpdir: pathlib.Path):
     # always adding .gitignore
     gitignore = ROOT_DIR / ".gitignore"