armv7: enable gcc-8 for armv7 cross-compile

Ref: #2445
nodejs · Apr 8, 2021 · b709282 · b709282
1 parent d034c8f
commit b709282
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
@@ -121,11 +121,9 @@ raspberry_pi: {
       { name: 'jessie', template: 'rpi_jessie.Dockerfile.j2' }
     ],
     armv7l: [
-      { name: 'jessie', template: 'rpi_jessie.Dockerfile.j2' },
       { name: 'stretch', template: 'rpi_stretch.Dockerfile.j2' }
     ],
     arm64: [
-      { name: 'jessie', template: 'rpi_jessie.Dockerfile.j2' },
       { name: 'stretch', template: 'rpi_stretch.Dockerfile.j2' }
     ]
   }

diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy
@@ -50,6 +50,8 @@ def buildExclusions = [
   [ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/,   anyType, lt(12)  ],
   [ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/,   anyType, gte(14) ],
   [ /^cross-compiler-ubuntu1804-armv7-gcc-6/,      anyType, lt(14)  ],
+  [ /^cross-compiler-ubuntu1804-armv7-gcc-6/,      anyType, gte(16) ],
+  [ /^cross-compiler-ubuntu1804-armv7-gcc-8,       anyType, lt(16)  ],
   [ /^ubuntu1604-arm64/,              anyType,     gte(14) ],
 
   // Windows -----------------------------------------------