Select devtoolset-8 for rhel7-s390x

PR-URL: #2262
nodejs · Apr 9, 2020 · a042232 · a042232
1 parent 3804506
commit a042232
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy
@@ -37,6 +37,7 @@ def buildExclusions = [
   // Linux PPC LE ------------------------------------------
   [ /^centos7-ppcle/,                 anyType,     lt(10)  ],
   [ /^ppcle-ubuntu/,                  releaseType, gte(10) ],
+  [ /^ppcle-ubuntu/,                  anyType,     gte(14) ],
 
   // Linux S390X --------------------------------------------
   [ /s390x/,                          anyType,     lt(6)   ],

diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
@@ -86,7 +86,14 @@ elif [ "$SELECT_ARCH" = "S390X" ]; then
 
   echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on s390x"
 
-  if [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
+  if [ "$NODEJS_MAJOR_VERSION" -gt "13" ]; then
+    # Setup devtoolset-8, sets LD_LIBRARY_PATH, PATH, etc.
+    . /opt/rh/devtoolset-8/enable
+    export CC="ccache s390x-redhat-linux-gcc"
+    export CXX="ccache s390x-redhat-linux-g++"
+    export LINK="s390x-redhat-linux-g++"
+    echo "Compiler set to devtoolset-8"
+  elif [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
     # Setup devtoolset-6, sets LD_LIBRARY_PATH, PATH, etc.
     . /opt/rh/devtoolset-6/enable
     export CC="ccache s390x-redhat-linux-gcc"