fixup! jenkins,ansible: arm cross-compilers as docker containers

nodejs · Apr 16, 2020 · 28ac206 · 28ac206
1 parent 1001a42
commit 28ac206
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -133,7 +133,6 @@ hosts:
         smartos18-x64-3: {ip: 165.225.151.114}
         smartos18-x64-4: {ip: 165.225.149.13}
         ubuntu1604_arm_cross-x64-1: {ip: 165.225.149.35, user: ubuntu}
-        ubuntu1804_arm_cross-x64-1: {ip: 165.225.149.157, user: ubuntu}
         ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu}
         ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu}
 

diff --git a/ansible/roles/cross-compiler/tasks/main.yml b/ansible/roles/cross-compiler/tasks/main.yml
@@ -8,10 +8,6 @@
   apt_repository:
     repo: ppa:ubuntu-toolchain-r/test
 
-- name: upgrade installed packages
-  apt:
-    update_cache: yes
-
 - name: upgrade installed packages
   apt:
     upgrade: dist

diff --git a/ansible/roles/docker/files/cc-selector.sh b/ansible/roles/docker/files/cc-selector.sh
@@ -1,14 +1,11 @@
 # create CC, CXX, CC_host and CXX_host environment variables appropriate for the
 # worker label in use. Of the form: cross-compiler-ubuntu1[68]04-armv[67]-gcc-(4\.9.4?|6|8)
 
-# Possible labels:
+# Expected labels:
 # cross-compiler-ubuntu1604-armv6-gcc-4.9.4
 # cross-compiler-ubuntu1604-armv7-gcc-4.9.4
-# cross-compiler-ubuntu1604-armv6-gcc-6
 # cross-compiler-ubuntu1604-armv7-gcc-6
-# cross-compiler-ubuntu1804-armv6-gcc-6
 # cross-compiler-ubuntu1804-armv7-gcc-6
-# cross-compiler-ubuntu1804-armv6-gcc-8
 # cross-compiler-ubuntu1804-armv7-gcc-8
 
 rpi_newer_tools_base="/opt/raspberrypi/rpi-newer-crosstools/"