Group CI jobs in "quick-checks" stage together

Move the jobs in the "quick-checks" stage to the same place in
.gitlab-ci.yml.

(cherry picked from commit b3ac6b47d9bd347a2a008cd834a8553d585e9308)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41cccee3e78e363a6bc1ef892dd55f62fa318f10..50b9a51f9b89ce3c08e91b10778f7253815053be 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -801,6 +801,41 @@ mypy:
   script:
     - mypy "bin/tests/system/isctest/"
 
+linkcheck:
+  <<: *quick_checks_job
+  script:
+    # Some domains tested by linkchecker may think that we connect to them too
+    # often and will refuse connection or reply with and error code, which
+    # makes this job fail. Let's check links only on Wednesdays.
+    - if [ "$(date +%w)" != "3" ]; then exit 0; fi
+    - pushd doc/arm/ > /dev/null && sphinx-build -b linkcheck . linkcheck_output/
+  artifacts:
+    paths:
+      - doc/arm/linkcheck_output/
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+  needs: []
+
+generate-stress-test-configs:
+  <<: *quick_checks_job
+  script:
+    - *git_clone_bind9-qa
+    - bind9-qa/stress/generate-stress-test-configs.py > stress-test-configs.yml
+  artifacts:
+    paths:
+      - stress-test-configs.yml
+  needs: []
+
+generate-tsan-stress-test-configs:
+  <<: *quick_checks_job
+  script:
+    - util/generate-tsan-stress-jobs.py > tsan-stress-test-configs.yml
+  artifacts:
+    paths:
+      - tsan-stress-test-configs.yml
+  needs: []
+  when: manual
+
 # Jobs in the other-checks stage
 
 checkbashisms:
@@ -951,21 +986,6 @@ changelog:
   artifacts:
     untracked: true
 
-linkcheck:
-  <<: *quick_checks_job
-  script:
-    # Some domains tested by linkchecker may think that we connect to them too
-    # often and will refuse connection or reply with and error code, which
-    # makes this job fail. Let's check links only on Wednesdays.
-    - if [ "$(date +%w)" != "3" ]; then exit 0; fi
-    - pushd doc/arm/ > /dev/null && sphinx-build -b linkcheck . linkcheck_output/
-  artifacts:
-    paths:
-      - doc/arm/linkcheck_output/
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-  needs: []
-
 docs:
   <<: *default_triggering_rules
   <<: *base_image
@@ -1555,16 +1575,6 @@ unit:clang:tsan:
     - job: clang:tsan
       artifacts: true
 
-generate-tsan-stress-test-configs:
-  <<: *quick_checks_job
-  script:
-    - util/generate-tsan-stress-jobs.py > tsan-stress-test-configs.yml
-  artifacts:
-    paths:
-      - tsan-stress-test-configs.yml
-  needs: []
-  when: manual
-
 tsan:stress:
   <<: *default_triggering_rules
   stage: system
@@ -2094,16 +2104,6 @@ shotgun:doh-get:
   #   - *shotgun_rule_tag
   #   - *shotgun_rule_other
 
-generate-stress-test-configs:
-  <<: *quick_checks_job
-  script:
-    - *git_clone_bind9-qa
-    - bind9-qa/stress/generate-stress-test-configs.py > stress-test-configs.yml
-  artifacts:
-    paths:
-      - stress-test-configs.yml
-  needs: []
-
 stress-test-child-pipeline:
   <<: *default_triggering_rules
   stage: performance