Enable devtoolset-7 on CentOS

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7359b0bd467e5c0f5a4d75dfd7c390799f55ca33..b1166b4648d8f486c46b5ae6f44a1cc64f46b674 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ variables:
   DOCKER_DRIVER: overlay2
   CI_REGISTRY_IMAGE: registry.gitlab.isc.org/isc-projects/images/bind9
   CCACHE_DIR: "/ccache"
+  CMDPREFIX: "bash -c"
 
 stages:
   - precheck
@@ -114,8 +115,8 @@ stages:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
 #    - ./autogen.sh
   script:
-    - ./configure --enable-developer --with-libtool --disable-static --with-atf=/usr $EXTRA_CONFIGURE
-    - make -j${PARALLEL_JOBS_BUILD:-1} -k all V=1
+    - $CMDPREFIX "./configure --enable-developer --with-libtool --disable-static --with-atf=/usr $EXTRA_CONFIGURE"
+    - $CMDPREFIX "make -j${PARALLEL_JOBS_BUILD:-1} -k all V=1"
   artifacts:
     expire_in: '1 hour'
     untracked: true
@@ -129,8 +130,8 @@ stages:
     - echo "0:/tmp/softhsm.db" > $SOFTHSM_CONF
     - if command -v softhsm2-util >/dev/null; then softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm"; fi
   script:
-    - ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
-    - test -s bin/tests/system/systests.output
+    - $CMDPREFIX bash -x "cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1"
+    - $CMDPREFIX bash -x "test -s bin/tests/system/systests.output"
   artifacts:
     untracked: true
     expire_in: '1 week'
@@ -144,7 +145,7 @@ stages:
     - echo "0:/tmp/softhsm.db" > $SOFTHSM_CONF
     - if command -v softhsm2-util >/dev/null; then softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm"; fi
   script:
-    - make unit
+    - $CMDPREFIX "make unit"
   after_script:
     - kyua report-html --force --results-file kyua.results --results-filter "" --output kyua_html
   artifacts:
@@ -203,6 +204,7 @@ build:centos:centos6:amd64:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
     EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error"
+    CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos6_amd64_image
   <<: *build_job
 
@@ -211,6 +213,7 @@ build:centos:centos7:amd64:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
     EXTRA_CONFIGURE: "--with-libidn2"
+    CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos7_amd64_image
   <<: *build_job
 
@@ -261,12 +264,16 @@ build:debian:sid:i386:
   <<: *build_job
 
 unittest:centos:centos6:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos6_amd64_image
   <<: *unit_test_job
   dependencies:
     - build:centos:centos6:amd64
 
 unittest:centos:centos7:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos7_amd64_image
   <<: *unit_test_job
   dependencies:
@@ -303,12 +310,16 @@ unittest:debian:sid:i386:
     - build:debian:sid:i386
 
 systemtest:centos:centos6:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos6_amd64_image
   <<: *system_test_job
   dependencies:
     - build:centos:centos6:amd64
 
 systemtest:centos:centos7:amd64:
+  variables:
+      CMDPREFIX: "scl enable devtoolset-7"
   <<: *centos_centos7_amd64_image
   <<: *system_test_job
   dependencies: