Skip to content

Commit d032050

Browse files
authored
Refactor test execution logic to prioritize Konflux tests over Jenkins based on PR labels (#58)
1 parent 6c2ca06 commit d032050

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

files/bin/deploy-iqe-cji.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,13 @@ def check_cji_jobs(self) -> None:
228228
print(f"\nAll jobs succeeded: {job_map}", flush=True)
229229

230230
def run(self) -> None:
231-
# Skip Konflux tests unless explicitly labeled.
232-
# This prevents tests from running in both Jenkins and Konflux and can be
233-
# removed when Konflux increases the integration test timeout and
234-
# Jenkins tests are disabled.
235-
#
236-
# https://issues.redhat.com/browse/KONFLUX-5449
237231
if self.pr_labels:
238-
if "ok-to-skip-smokes" in self.pr_labels:
239-
display("PR labeled to skip smoke tests")
232+
if "run-jenkins-tests" in self.pr_labels:
233+
display("PR labeled to run Jenkins tests instead of Konflux")
240234
return
241235

242-
if "run-konflux-tests" not in self.pr_labels:
243-
display("PR is not labeled to run tests in Konflux")
236+
if "ok-to-skip-smokes" in self.pr_labels:
237+
display("PR labeled to skip smoke tests")
244238
return
245239

246240
if "smokes-required" in self.pr_labels and not any(label.endswith("smoke-tests") for label in self.pr_labels):

0 commit comments

Comments
 (0)