From 95eec2b5a7d7db3b2d83f8d188f7c8ab93a2fc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 26 Nov 2020 13:27:08 +0100 Subject: [PATCH] Use CentOS 6 instead of Debian sid in i386 CI jobs Due to seccomp issues with 32-bit Debian sid Docker containers that prevent us from easily updating the contents of the 32-bit Debian sid Docker image, switch to CentOS 6 for building and testing 32-bit versions of BIND in GitLab CI. --- .gitlab-ci.yml | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 163ae94064..e016d70835 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,6 +100,10 @@ stages: # CentOS +.centos-centos6-i386: ¢os_centos6_i386_image + image: "$CI_REGISTRY_IMAGE:centos-centos6-i386" + <<: *linux_i386 + .centos-centos6-amd64: ¢os_centos6_amd64_image image: "$CI_REGISTRY_IMAGE:centos-centos6-amd64" <<: *linux_amd64 @@ -126,10 +130,6 @@ stages: image: "$CI_REGISTRY_IMAGE:debian-sid-amd64" <<: *linux_amd64 -.debian-sid-i386: &debian_sid_i386_image - image: "$CI_REGISTRY_IMAGE:debian-sid-i386" - <<: *linux_i386 - # openSUSE Tumbleweed .tumbleweed-latest-amd64: &tumbleweed_latest_amd64_image @@ -575,6 +575,30 @@ unit:gcc:alpine3.12:amd64: - job: gcc:alpine3.12:amd64 artifacts: true +# Jobs for regular GCC builds on CentOS 6 (i386) + +gcc:centos6:i386: + variables: + CC: gcc + CFLAGS: "${CFLAGS_COMMON}" + EXTRA_CONFIGURE: "--with-libidn2 --without-python --disable-warn-error" + <<: *centos_centos6_i386_image + <<: *build_job + +system:gcc:centos6:i386: + <<: *centos_centos6_i386_image + <<: *system_test_job + needs: + - job: gcc:centos6:i386 + artifacts: true + +unit:gcc:centos6:i386: + <<: *centos_centos6_i386_image + <<: *unit_test_job + needs: + - job: gcc:centos6:i386 + artifacts: true + # Jobs for regular GCC builds on CentOS 6 (amd64) gcc:centos6:amd64: @@ -816,30 +840,6 @@ unit:gcc:tarball: - schedules - tags -# Jobs for regular GCC builds on Debian Sid (i386) - -gcc:sid:i386: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-libidn2 --without-python" - <<: *debian_sid_i386_image - <<: *build_job - -system:gcc:sid:i386: - <<: *debian_sid_i386_image - <<: *system_test_job - needs: - - job: gcc:sid:i386 - artifacts: true - -unit:gcc:sid:i386: - <<: *debian_sid_i386_image - <<: *unit_test_job - needs: - - job: gcc:sid:i386 - artifacts: true - # Jobs for debug GCC builds on openSUSE Tumbleweed (amd64) gcc:tumbleweed:amd64: