From b8c4ec5c8c18360dee83eb6b360e18f26897a15a Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 23 Oct 2019 12:40:12 +1100 Subject: [PATCH] fixup! ansible,jenkins: install gcc-7 on ubuntu1604 machines, use on node>12 --- jenkins/scripts/select-compiler.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index fc02b772b..4c38f86eb 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -125,7 +125,7 @@ elif [ "$SELECT_ARCH" = "X64" ]; then elif [[ "$nodes" =~ centos[67]-64-gcc6 ]]; then . /opt/rh/devtoolset-6/enable echo "Compiler set to devtoolset-6" - elif test $nodes = "ubuntu1604"; then + elif test $nodes = "ubuntu1604-64"; then if [ "$NODEJS_MAJOR_VERSION" -gt "12" ]; then export CC="gcc-6" export CXX="g++-6"