From: Michal Nowak <mnowak@isc.org>
Date: Thu, 23 Mar 2023 10:05:54 +0000 (+0100)
Subject: Drop "unstable" Debian "bullseye" unit and system jobs
X-Git-Tag: v9.19.12~58^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b9111b4358c0183eee03082e025fea37a11e852;p=thirdparty%2Fbind9.git

Drop "unstable" Debian "bullseye" unit and system jobs

"Unstable" Debian "bullseye" unit and system jobs differ from unit and
system jobs on the Debian "bullseye" image by running a few more tests
enabled by the CI_ENABLE_ALL_TESTS environmental variable.  These tests
are no less stable than the rest, and thus to have distinct jobs for
them wastes resources.

Run "unstable" unit and system tests as part of stock Debian "bullseye"
jobs.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8e4fc9673e..d13c717af94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -642,7 +642,6 @@ gcc:tarball:nosphinx:
       artifacts: true
 
 # Jobs for regular GCC builds on Debian 11 "bullseye" (amd64)
-# (The second unit test job also executes unstable unit tests.)
 
 gcc:bullseye:amd64:
   variables:
@@ -657,31 +656,15 @@ gcc:bullseye:amd64:
 system:gcc:bullseye:amd64:
   <<: *debian_bullseye_amd64_image
   <<: *system_test_gcov_job
-  needs:
-    - job: unit:gcc:bullseye:amd64
-      artifacts: true
-
-system:gcc:bullseye:unstable:amd64:
-  <<: *debian_bullseye_amd64_image
-  <<: *system_test_job
-  <<: *api_schedules_triggers_web_triggering_rules
   variables:
     CI_ENABLE_ALL_TESTS: 1
   needs:
-    - job: gcc:bullseye:amd64
+    - job: unit:gcc:bullseye:amd64
       artifacts: true
 
 unit:gcc:bullseye:amd64:
   <<: *debian_bullseye_amd64_image
   <<: *unit_test_gcov_job
-  needs:
-    - job: gcc:bullseye:amd64
-      artifacts: true
-
-unit:gcc:bullseye:unstable:amd64:
-  <<: *debian_bullseye_amd64_image
-  <<: *unit_test_job
-  <<: *api_schedules_triggers_web_triggering_rules
   variables:
     CI_ENABLE_ALL_TESTS: 1
   needs: