Restoring changes.

Author: bacciotti

files/bin/deploy-iqe-cji.py

@@ -228,16 +228,22 @@ def check_cji_jobs(self) -> None:
         print(f"\nAll jobs succeeded: {job_map}", flush=True)
 
     def run(self) -> None:
-        if not self.pr_labels:
+        if self.pr_labels:
+            if "run-jenkins-tests" in self.pr_labels:
+                display("PR labeled to run Jenkins tests instead of Konflux")
+                return
+
+            if "ok-to-skip-smokes" in self.pr_labels:
+                display("PR labeled to skip smoke tests")
+                return
+
+            if "smokes-required" in self.pr_labels and not any(label.endswith("smoke-tests") for label in self.pr_labels):
+                sys.exit("Missing smoke tests labels.")
+        else:
+            # Labels are empty (nightly/manual snapshot scenario)
             display("[INFO] No PR labels found. Assuming this is a scheduled or manual test run.")
             display("[INFO] Proceeding with full smoke tests...")
 
-        if "ok-to-skip-smokes" in self.pr_labels:
-            display("[INFO] PR labeled with 'ok-to-skip-smokes'. Skipping smoke tests.")
-            return
-
-        display("[INFO] Starting deploy. Label validation was already handled by Tekton.")
-
         self.run_pod()
 
         try:
@@ -279,4 +285,4 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    main()

files/bin/deploy.py

@@ -135,18 +135,27 @@ def main() -> None:
     components_arg = chain.from_iterable(("--component", component) for component in components)
     components_with_resources = os.environ.get("COMPONENTS_W_RESOURCES", "").split()
     components_with_resources_arg = chain.from_iterable(("--no-remove-resources", component) for component in components_with_resources)
+    snapshot_components = {component.name for component in snapshot.components}
     deploy_frontends = os.environ.get("DEPLOY_FRONTENDS") or "false"
     deploy_timeout = get_timeout("DEPLOY_TIMEOUT", labels)
     extra_deploy_args = os.environ.get("EXTRA_DEPLOY_ARGS", "")
     optional_deps_method = os.environ.get("OPTIONAL_DEPS_METHOD", "hybrid")
     ref_env = os.environ.get("REF_ENV", "insights-production")
 
     if pr_number:
+        if "run-jenkins-tests" in labels:
+            display("PR labeled to run Jenkins tests instead of Konflux")
+            return
+
         if "ok-to-skip-smokes" in labels:
-            display("[INFO] PR labeled with 'ok-to-skip-smokes'. Skipping deploy.")
+            display("PR labeled to skip smoke tests")
             return
+
+        if "koku" in snapshot_components and "smokes-required" in labels and not any(label.endswith("smoke-tests") for label in labels):
+            sys.exit("Missing smoke tests labels.")
+
     else:
-        display("[INFO] No PR number found. Assuming this is a scheduled or manual test run.")
+        display("[INFO] No PR number found. Assuming nightly/manual test run.")
         display("[INFO] Proceeding with full smoke tests...")
 
     for secret in ["koku-aws", "koku-gcp"]:
@@ -182,4 +191,4 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    main()