Revise merge request pipeline job triggering rules

Over the past few years, some of the initial decisions made about which
GitLab CI jobs to run for all merge requests and which of them to run
just for scheduled/web-triggered pipelines turned out to be less than
ideal in practice: test coverage was found to be too lax in some areas
and on the other hand unnecessarily repetitive in others.  For example,
compilation failures for certain build types that are not exercised for
every merge request (e.g. FIPS-enabled builds) turned out to be much
more common in practice than e.g. test failures happening only on a
subset of releases of a given Linux distribution.

To limit excessive resource use while retaining broad test coverage,
adjust GitLab CI job triggering rules for merge request pipelines as
follows:

  - run all possible build jobs for every merge request; compilation
    failures triggered for build flavors that were only tested in
    scheduled pipelines turned out to be surprisingly commonplace and
    became a nuisance over time, particularly given that the run times
    of build jobs are much lower than those of test jobs,

  - for every merge request, run at least one system & unit test job for
    each build flavor (e.g. sanitizer-enabled, FIPS-enabled,
    out-of-tree, tarball-based, etc.),

  - limit the amount of test jobs run for each distinct operating
    system; for example, only run system & unit test jobs for Ubuntu
    24.04 Noble Numbat in merge request pipelines, skipping those for
    Ubuntu 22.04 Jammy Jellyfish and Ubuntu 20.04 Focal Fossa (while
    still running them in other pipeline types, e.g. in scheduled
    pipelines),

  - ensure every merge request is tested on Oracle Linux 8, which is the
    operating system with the oldest package versions out of the systems
    that are still supported by this BIND 9 branch,

  - decrease the number of test jobs run with sanitizers enabled while
    still testing with both ASAN and TSAN and both GCC and Clang for
    every merge request.

These changes do not affect the set of jobs created for any other
pipeline type (triggered by a schedule, by a GitLab API call, by the web
interface, etc.); only merge request pipelines are affected.

(cherry picked from commit 4ad8c86cf2ba6e60f60fe7b0f60eb7d3bd3718b6)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40c9b5133e523d9a9797673598fb1bdd1a448690..12bdfbd3eac2839ad3d01e0ca06677d127dc6874 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -860,6 +860,7 @@ gcc:oraclelinux8:amd64:
 system:gcc:oraclelinux8:amd64:
   <<: *oraclelinux_8_amd64_image
   <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:oraclelinux8:amd64
       artifacts: true
@@ -867,6 +868,7 @@ system:gcc:oraclelinux8:amd64:
 unit:gcc:oraclelinux8:amd64:
   <<: *oraclelinux_8_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:oraclelinux8:amd64
       artifacts: true
@@ -996,7 +998,7 @@ gcc:sid:amd64:
 system:gcc:sid:amd64:
   <<: *debian_sid_amd64_image
   <<: *system_test_job
-  <<: *system_test_make_check_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:sid:amd64
       artifacts: true
@@ -1004,6 +1006,7 @@ system:gcc:sid:amd64:
 unit:gcc:sid:amd64:
   <<: *debian_sid_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:sid:amd64
       artifacts: true
@@ -1030,7 +1033,6 @@ system:gcc:out-of-tree:
       artifacts: true
   <<: *base_image
   <<: *system_test_job
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
 
 unit:gcc:out-of-tree:
   variables:
@@ -1040,7 +1042,6 @@ unit:gcc:out-of-tree:
       artifacts: true
   <<: *base_image
   <<: *unit_test_job
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
 
 # Jobs for tarball GCC builds on Debian 12 "bookworm" (amd64)
 
@@ -1060,7 +1061,6 @@ gcc:tarball:
 system:gcc:tarball:
   <<: *base_image
   <<: *system_test_job
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   before_script:
     - cd bind-*
     - *setup_interfaces
@@ -1074,7 +1074,6 @@ system:gcc:tarball:
 unit:gcc:tarball:
   <<: *base_image
   <<: *unit_test_job
-  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   before_script:
     - cd bind-*
   needs:
@@ -1102,6 +1101,7 @@ gcc:tumbleweed:amd64:
 system:gcc:tumbleweed:amd64:
   <<: *tumbleweed_latest_amd64_image
   <<: *system_test_job
+  <<: *system_test_make_check_job
   needs:
     - job: gcc:tumbleweed:amd64
       artifacts: true
@@ -1126,6 +1126,7 @@ gcc:focal:amd64:
 system:gcc:focal:amd64:
   <<: *ubuntu_focal_amd64_image
   <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:focal:amd64
       artifacts: true
@@ -1133,6 +1134,7 @@ system:gcc:focal:amd64:
 unit:gcc:focal:amd64:
   <<: *ubuntu_focal_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:focal:amd64
       artifacts: true
@@ -1150,6 +1152,7 @@ gcc:jammy:amd64:
 system:gcc:jammy:amd64:
   <<: *ubuntu_jammy_amd64_image
   <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:jammy:amd64
       artifacts: true
@@ -1157,6 +1160,7 @@ system:gcc:jammy:amd64:
 unit:gcc:jammy:amd64:
   <<: *ubuntu_jammy_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:jammy:amd64
       artifacts: true
@@ -1224,6 +1228,7 @@ clang:asan:
 system:clang:asan:
   <<: *base_image
   <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: clang:asan
       artifacts: true
@@ -1231,6 +1236,7 @@ system:clang:asan:
 unit:clang:asan:
   <<: *base_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: clang:asan
       artifacts: true
@@ -1253,6 +1259,7 @@ system:gcc:tsan:
     TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}"
   <<: *tsan_fedora_42_amd64_image
   <<: *system_test_tsan_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:tsan
       artifacts: true
@@ -1262,6 +1269,7 @@ unit:gcc:tsan:
     TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}"
   <<: *tsan_fedora_42_amd64_image
   <<: *unit_test_tsan_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: gcc:tsan
       artifacts: true
@@ -1345,6 +1353,7 @@ system:clang:bookworm:amd64:
     SOFTHSM2_MODULE: "/usr/lib/softhsm/libsofthsm2.so"
   <<: *debian_bookworm_amd64_image
   <<: *system_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: clang:bookworm:amd64
       artifacts: true
@@ -1352,6 +1361,7 @@ system:clang:bookworm:amd64:
 unit:clang:bookworm:amd64:
   <<: *debian_bookworm_amd64_image
   <<: *unit_test_job
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: clang:bookworm:amd64
       artifacts: true
@@ -1365,6 +1375,7 @@ clang:freebsd13:amd64:
 system:clang:freebsd13:amd64:
   <<: *system_test_job
   <<: *freebsd_autoscaler_13_amd64
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true
@@ -1372,6 +1383,7 @@ system:clang:freebsd13:amd64:
 unit:clang:freebsd13:amd64:
   <<: *unit_test_job
   <<: *freebsd_autoscaler_13_amd64
+  <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true