mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
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.
This commit is contained in:
@@ -882,13 +882,15 @@ gcc:bionic:amd64:
|
||||
variables:
|
||||
CC: gcc
|
||||
CFLAGS: "${CFLAGS_COMMON} -O2"
|
||||
EXTRA_CONFIGURE: "--disable-dnstap --disable-geoip"
|
||||
EXTRA_CONFIGURE: "--disable-dnstap"
|
||||
<<: *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
|
||||
@@ -896,6 +898,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
|
||||
@@ -906,7 +909,7 @@ gcc:focal:amd64:
|
||||
variables:
|
||||
CC: gcc
|
||||
CFLAGS: "${CFLAGS_COMMON} -Og"
|
||||
EXTRA_CONFIGURE: "--with-libidn2"
|
||||
EXTRA_CONFIGURE: "--disable-geoip --with-libidn2"
|
||||
<<: *ubuntu_focal_amd64_image
|
||||
<<: *build_job
|
||||
|
||||
|
Reference in New Issue
Block a user