Skip to content
This repository was archived by the owner on Aug 13, 2025. It is now read-only.

Commit 2587fef

Browse files
committed
Merge branch 'mnowak/drop-unit-and-system-test-jobs' into 'main'
Drop tests on amd64cross32; move "unstable" unit and system jobs; drop Tumbleweed See merge request isc-projects/bind9!7717
2 parents a8fbdbe + 2b9111b commit 2587fef

File tree

1 file changed

+3
-34
lines changed

1 file changed

+3
-34
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,6 @@ gcc:tarball:nosphinx:
642642
artifacts: true
643643

644644
# Jobs for regular GCC builds on Debian 11 "bullseye" (amd64)
645-
# (The second unit test job also executes unstable unit tests.)
646645

647646
gcc:bullseye:amd64:
648647
variables:
@@ -657,39 +656,23 @@ gcc:bullseye:amd64:
657656
system:gcc:bullseye:amd64:
658657
<<: *debian_bullseye_amd64_image
659658
<<: *system_test_gcov_job
660-
needs:
661-
- job: unit:gcc:bullseye:amd64
662-
artifacts: true
663-
664-
system:gcc:bullseye:unstable:amd64:
665-
<<: *debian_bullseye_amd64_image
666-
<<: *system_test_job
667-
<<: *api_schedules_triggers_web_triggering_rules
668659
variables:
669660
CI_ENABLE_ALL_TESTS: 1
670661
needs:
671-
- job: gcc:bullseye:amd64
662+
- job: unit:gcc:bullseye:amd64
672663
artifacts: true
673664

674665
unit:gcc:bullseye:amd64:
675666
<<: *debian_bullseye_amd64_image
676667
<<: *unit_test_gcov_job
677-
needs:
678-
- job: gcc:bullseye:amd64
679-
artifacts: true
680-
681-
unit:gcc:bullseye:unstable:amd64:
682-
<<: *debian_bullseye_amd64_image
683-
<<: *unit_test_job
684-
<<: *api_schedules_triggers_web_triggering_rules
685668
variables:
686669
CI_ENABLE_ALL_TESTS: 1
687670
needs:
688671
- job: gcc:bullseye:amd64
689672
artifacts: true
690673

691-
# Jobs for cross-compiled GCC builds on Debian 11 "bullseye" (amd64) with
692-
# 32-bit libraries
674+
# Build job for cross-compiled GCC builds on 64-bit Debian 11 "bullseye"
675+
# (amd64) with 32-bit BIND 9.
693676

694677
gcc:bullseye:amd64cross32:
695678
variables:
@@ -699,20 +682,6 @@ gcc:bullseye:amd64cross32:
699682
<<: *debian_bullseye_amd64cross32_image
700683
<<: *build_job
701684

702-
system:gcc:bullseye:amd64cross32:
703-
<<: *debian_bullseye_amd64cross32_image
704-
<<: *system_test_job
705-
needs:
706-
- job: gcc:bullseye:amd64cross32
707-
artifacts: true
708-
709-
unit:gcc:bullseye:amd64cross32:
710-
<<: *debian_bullseye_amd64cross32_image
711-
<<: *unit_test_job
712-
needs:
713-
- job: gcc:bullseye:amd64cross32
714-
artifacts: true
715-
716685
# Jobs for scan-build builds on Debian 11 "bullseye" (amd64)
717686

718687
.scan_build: &scan_build

0 commit comments

Comments
 (0)