Fix ci-qemu Arduino install dir (apache#8766)

ylc · Jan 13, 2022 · d407f5a · d407f5a
1 parent 25716cf
commit d407f5a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu
@@ -66,6 +66,11 @@ RUN bash /install/ubuntu_install_zephyr.sh
 ENV ZEPHYR_BASE=/opt/zephyrproject/zephyr
 
 # Arduino deps
+# NOTE: override Arduino directories so packages are installed in a
+# CI-accessible location.
+ENV ARDUINO_DIRECTORIES_DATA=/arduino15-data
+ENV ARDUINO_DIRECTORIES_DOWNLOADS=/arduino15-downloads
+ENV ARDUINO_DIRECTORIES_USER=/arduino15-user
 COPY install/ubuntu_install_arduino.sh /install/ubuntu_install_arduino.sh
 RUN bash /install/ubuntu_install_arduino.sh
 

diff --git a/docker/install/ubuntu_install_arduino.sh b/docker/install/ubuntu_install_arduino.sh
@@ -29,3 +29,8 @@ wget -O - https://raw.githubusercontent.com/arduino/arduino-cli/master/install.s
 # Install supported cores from those URLS
 arduino-cli core install arduino:mbed_nano
 arduino-cli core install arduino:sam
+
+# ARDUINO_DIRECTORIES_USER wouldn't normally be created until we
+# install a package, which would casue chmod to fail
+mkdir -p "${ARDUINO_DIRECTORIES_DATA}" "${ARDUINO_DIRECTORIES_USER}" "${ARDUINO_DIRECTORIES_DOWNLOADS}"
+chmod -R o+rw "${ARDUINO_DIRECTORIES_DATA}" "${ARDUINO_DIRECTORIES_USER}" "${ARDUINO_DIRECTORIES_DOWNLOADS}"