Move FreeBSD jobs to AWS autoscalers

From technical reasons --with-readline=libedit is not being tested on
FreeBSD anymore as it's hard to have anchors both unified and specific.

(cherry picked from commit e0df774ca093bfc775232c5a543162de3c7245c2)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd9f8e5e8aefedf165f70e034a9feb7558e3078c..1040f84f1ed464e9d2690a403bcea86293b2777b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,16 +117,55 @@ stages:
     - runner-manager
     - aarch64
 
-# Autoscaling GitLab Runner on AWS EC2 (FreeBSD)
-
-.freebsd-stress-amd64: &freebsd_stress_amd64
+.freebsd-autoscaler-13-amd64-tags: &freebsd_autoscaler_13_amd64_tags
   tags:
-    - bsd-stress-test
-    - aws
+    - amd64
     - autoscaler
+    - aws
+    - bsd-stress-test-1
     - shell
     - stress-test
+
+.freebsd-autoscaler-14-amd64-tags: &freebsd_autoscaler_14_amd64_tags
+  tags:
     - amd64
+    - autoscaler
+    - aws
+    - bsd-stress-test-2
+    - shell
+    - stress-test
+
+.freebsd-autoscaler-amd64: &freebsd_autoscaler_amd64
+  variables:
+    CC: clang
+    CFLAGS: "${CFLAGS_COMMON} -Og"
+    # Even though there's only one job per runtime environment, the GitLab
+    # "instance" executor insists on cloning the Git repository to a path that
+    # contains a variable number from zero to the "maximum concurrent instances
+    # count" allowed on the GitLab Runner. See the "0" directory in this
+    # example path: /home/ec2-user/builds/t1_4FZzvz/0/isc-projects/bind9/.git/.
+    #
+    # This is not a problem for isolated jobs like "stress" tests that depend
+    # on no other jobs. However, it is a problem for jobs that need other jobs'
+    # artifacts. For example, a system test job that has its Git repo cloned to
+    # the "/1/" sub-path will fail if it downloads build job artifacts that
+    # have ./configure output files with "/0/" in its sub-path recorded.
+    GIT_CLONE_PATH: "/home/ec2-user/builds/${CI_PROJECT_PATH}/"
+    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
+    # incompatibility; see https://bugs.freebsd.org/275241.
+    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE} --with-gssapi=/usr/local/bin/krb5-config"
+
+# Autoscaling GitLab Runner on AWS EC2 (FreeBSD 13)
+
+.freebsd-autoscaler-13-amd64: &freebsd_autoscaler_13_amd64
+  <<: *freebsd_autoscaler_amd64
+  <<: *freebsd_autoscaler_13_amd64_tags
+
+# Autoscaling GitLab Runner on AWS EC2 (FreeBSD 14)
+
+.freebsd-autoscaler-14-amd64: &freebsd_autoscaler_14_amd64
+  <<: *freebsd_autoscaler_amd64
+  <<: *freebsd_autoscaler_14_amd64_tags
 
 ### Docker Image Templates
 
@@ -206,14 +245,6 @@ stages:
 
 ### QCOW2 Image Templates
 
-.freebsd-13-amd64: &freebsd_13_amd64_image
-  image: "freebsd-13.4-x86_64"
-  <<: *libvirt_amd64
-
-.freebsd-14-amd64: &freebsd_14_amd64_image
-  image: "freebsd-14.2-x86_64"
-  <<: *libvirt_amd64
-
 .openbsd-amd64: &openbsd_amd64_image
   image: "openbsd-7.6-x86_64"
   <<: *libvirt_amd64
@@ -1331,27 +1362,19 @@ unit:clang:bookworm:amd64:
 # Jobs for Clang builds on FreeBSD 13 (amd64)
 
 clang:freebsd13:amd64:
-  variables:
-    CFLAGS: "${CFLAGS_COMMON}"
-    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
-    # incompatibility; see https://bugs.freebsd.org/275241.
-    EXTRA_CONFIGURE: "${WITH_READLINE_LIBEDIT} --with-gssapi=/usr/local/bin/krb5-config"
-    USER: gitlab-runner
-  <<: *freebsd_13_amd64_image
   <<: *build_job
+  <<: *freebsd_autoscaler_13_amd64
 
 system:clang:freebsd13:amd64:
-  <<: *freebsd_13_amd64_image
   <<: *system_test_job
-  variables:
-    USER: gitlab-runner
+  <<: *freebsd_autoscaler_13_amd64
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true
 
 unit:clang:freebsd13:amd64:
-  <<: *freebsd_13_amd64_image
   <<: *unit_test_job
+  <<: *freebsd_autoscaler_13_amd64
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true
@@ -1359,27 +1382,19 @@ unit:clang:freebsd13:amd64:
 # Jobs for Clang builds on FreeBSD 14 (amd64)
 
 clang:freebsd14:amd64:
-  variables:
-    CFLAGS: "${CFLAGS_COMMON}"
-    # Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
-    # incompatibility; see https://bugs.freebsd.org/275241.
-    EXTRA_CONFIGURE: "${WITH_READLINE_EDITLINE} --with-gssapi=/usr/local/bin/krb5-config"
-    USER: gitlab-runner
-  <<: *freebsd_14_amd64_image
   <<: *build_job
+  <<: *freebsd_autoscaler_14_amd64
 
 system:clang:freebsd14:amd64:
-  <<: *freebsd_14_amd64_image
   <<: *system_test_job
-  variables:
-    USER: gitlab-runner
+  <<: *freebsd_autoscaler_14_amd64
   needs:
     - job: clang:freebsd14:amd64
       artifacts: true
 
 unit:clang:freebsd14:amd64:
-  <<: *freebsd_14_amd64_image
   <<: *unit_test_job
+  <<: *freebsd_autoscaler_14_amd64
   needs:
     - job: clang:freebsd14:amd64
       artifacts: true

diff --git a/util/generate-stress-test-configs.py b/util/generate-stress-test-configs.py
index a1eacc08928368b93520d729f1d999e486ecc6da..98d324f088cd9f81bb2b24d690ec858bc15203e3 100755 (executable)
--- a/util/generate-stress-test-configs.py
+++ b/util/generate-stress-test-configs.py
@@ -46,7 +46,11 @@ else:
 
 ALL_MODES = "recursive", "authoritative", "rpz"
 ALL_PROTOCOLS = "tcp", "doh", "dot"
-ALL_PLATFORMS = ".fedora-41-amd64", ".fedora-41-arm64", ".freebsd-stress-amd64"
+ALL_PLATFORMS = (
+    ".fedora-41-amd64",
+    ".fedora-41-arm64",
+    ".freebsd-autoscaler-13-amd64-tags",
+)
 
 # If ALL_BIND_STRESS_TESTS and CI_COMMIT_TAG environmental variables are unset,
 # pick only two of three items from "modes", "protocols", and "machines" to make
@@ -140,6 +144,14 @@ for mode, protocol, platform in itertools.product(modes, protocols, platforms):
         },
     }
 
+    # It is not strictly necessary to set GIT_CLONE_PATH in "stress" tests, but
+    # let's keep this consistent with build, unit, and system test jobs.
+    if "freebsd" in platform:
+        git_clone_path = anchors[".freebsd-autoscaler-amd64"]["variables"][
+            "GIT_CLONE_PATH"
+        ]
+        job_definition["variables"]["GIT_CLONE_PATH"] = git_clone_path
+
     job_definition |= anchors[platform]
 
     job_name = f"stress:{scenario}:{mode}:{protocol}+udp:{job_platform}"