diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ab799b23b..d13c717af9 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,39 +656,23 @@ 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: - job: gcc:bullseye:amd64 artifacts: true -# Jobs for cross-compiled GCC builds on Debian 11 "bullseye" (amd64) with -# 32-bit libraries +# Build job for cross-compiled GCC builds on 64-bit Debian 11 "bullseye" +# (amd64) with 32-bit BIND 9. gcc:bullseye:amd64cross32: variables: @@ -699,20 +682,6 @@ gcc:bullseye:amd64cross32: <<: *debian_bullseye_amd64cross32_image <<: *build_job -system:gcc:bullseye:amd64cross32: - <<: *debian_bullseye_amd64cross32_image - <<: *system_test_job - needs: - - job: gcc:bullseye:amd64cross32 - artifacts: true - -unit:gcc:bullseye:amd64cross32: - <<: *debian_bullseye_amd64cross32_image - <<: *unit_test_job - needs: - - job: gcc:bullseye:amd64cross32 - artifacts: true - # Jobs for scan-build builds on Debian 11 "bullseye" (amd64) .scan_build: &scan_build