From f95764a41f9531d7fc1233e637a845a6496cddea Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Thu, 17 Oct 2024 15:48:32 +0300
Subject: [PATCH] Move nightly schedule rule before main schedule for cng

---
 .gitlab/ci/rules.gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 648dfd430b2b5..4af68cd9b44e5 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -1845,20 +1845,20 @@
     - !reference [".qa:rules:e2e-blocking-base-before", rules]
     - !reference [".prevent-tier-2-and-below", rules]
     - !reference [".qa:rules:e2e-blocking-base-after", rules]
-    - <<: *if-dot-com-gitlab-org-schedule
+    - <<: *if-default-branch-schedule-nightly
       variables:
         CREATE_TEST_FAILURE_ISSUES: "true"
         PROCESS_TEST_RESULTS: "true"
-        KNAPSACK_GENERATE_REPORT: "false"
+        KNAPSACK_GENERATE_REPORT: "true"
         QA_SAVE_TEST_METRICS: "true"
-        QA_RUN_IN_PARALLEL: "true"
-    - <<: *if-default-branch-schedule-nightly
+        QA_RUN_IN_PARALLEL: "false" # disable single job parallelization due to incompatibility with knapsack
+    - <<: *if-dot-com-gitlab-org-schedule
       variables:
         CREATE_TEST_FAILURE_ISSUES: "true"
         PROCESS_TEST_RESULTS: "true"
-        KNAPSACK_GENERATE_REPORT: "true"
+        KNAPSACK_GENERATE_REPORT: "false"
         QA_SAVE_TEST_METRICS: "true"
-        QA_RUN_IN_PARALLEL: "false" # disable single job parallelization due to incompatibility with knapsack
+        QA_RUN_IN_PARALLEL: "true"
 
 .qa:rules:test-on-omnibus-nightly:
   rules:
-- 
GitLab