From f86d4f3bd8c5755dbc6d115e4a274e74c3bd856b Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 23 Mar 2023 10:30:59 +0100 Subject: [PATCH 1/2] Drop unit and system tests on amd64cross32 amd64cross32 jobs run a cross-compiled 32-bit BIND 9 on the 64-bit platform. This approach brings no build issues, and it is a good way to catch 32-bit issues in BIND 9 code-base and ensure cross-compilation keeps working. Unfortunately, running unit and system tests is a problem: - #3269 - doth-ns1 frequently failed to start - #3316 - quota_test sometimes fails to create new thread - #3956 - tcp-ns1 sometimes fails to allocate memory There's little value in running unit and system tests on the amd64cross32 platform, and it only means the effort spent by QA by looking into what turns out to be 32-bit limitations. --- .gitlab-ci.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ab799b23b..f8e4fc9673 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -688,8 +688,8 @@ unit:gcc:bullseye:unstable:amd64: - 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 +699,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 From 2b9111b4358c0183eee03082e025fea37a11e852 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 23 Mar 2023 11:05:54 +0100 Subject: [PATCH 2/2] Drop "unstable" Debian "bullseye" unit and system jobs "Unstable" Debian "bullseye" unit and system jobs differ from unit and system jobs on the Debian "bullseye" image by running a few more tests enabled by the CI_ENABLE_ALL_TESTS environmental variable. These tests are no less stable than the rest, and thus to have distinct jobs for them wastes resources. Run "unstable" unit and system tests as part of stock Debian "bullseye" jobs. --- .gitlab-ci.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8e4fc9673..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,31 +656,15 @@ 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: