Do not run Ubuntu 18.04 jobs in MR-triggered pipelines

With the addition of Ubuntu 22.04 three more CI jobs were added. To
compensate for that, move Ubuntu 18.04 jobs out of MR-triggered
pipelines to schedule-triggered ones.

Also, move --disable-geoip ./configure options from Ubuntu 18.04 to
Ubuntu 20.04 jobs to keep these options in the more frequent
MR-triggered pipelines.

(cherry picked from commit 06c591667efbe8d4e2ac12c1c6a679a34e0e8158)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ece83644a625ddd9dae5efba2bff05c6c7f98c8..9e144c58be2943d8442b03d8a036522976e54e31 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -876,13 +876,15 @@ gcc:bionic:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--disable-dnstap --disable-geoip --with-gssapi"
+    EXTRA_CONFIGURE: "--disable-dnstap --with-gssapi"
   <<: *ubuntu_bionic_amd64_image
   <<: *build_job
+  <<: *schedules_tags_web_triggering_rules
 
 system:gcc:bionic:amd64:
   <<: *ubuntu_bionic_amd64_image
   <<: *system_test_job
+  <<: *schedules_tags_web_triggering_rules
   needs:
     - job: gcc:bionic:amd64
       artifacts: true
@@ -890,6 +892,7 @@ system:gcc:bionic:amd64:
 unit:gcc:bionic:amd64:
   <<: *ubuntu_bionic_amd64_image
   <<: *unit_test_job
+  <<: *schedules_tags_web_triggering_rules
   needs:
     - job: gcc:bionic:amd64
       artifacts: true
@@ -900,7 +903,7 @@ gcc:focal:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr --disable-geoip"
   <<: *ubuntu_focal_amd64_image
   <<: *build_job