From 715a1ff701944814fcadfdba1ab5ff4055875d67 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Tue, 11 Jul 2023 15:37:35 +0200 Subject: [PATCH] Jenkins, docker_run.sh: use Debian 11 armhf container also for the other linux target builds. It's a follow up to e5503480e3a025728f760d0dcd05dd2a450b33a9 I wasn't aware that there are multiple different container versions used for almost the same build. --- .ci/Jenkinsfile-compile | 2 +- Tools/docker_run.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index f6a6275632..51fb95f15d 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,7 +9,7 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - armhf: "px4io/px4-dev-armhf:2022-08-12", + armhf: "px4io/px4-dev-armhf:2023-06-26", arm64: "px4io/px4-dev-aarch64:2022-08-12", base: "px4io/px4-dev-ros2-foxy:2022-08-12", nuttx: "px4io/px4-dev-nuttx-focal:2022-08-12", diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index 3ac640428e..a90314e207 100755 --- a/Tools/docker_run.sh +++ b/Tools/docker_run.sh @@ -7,13 +7,13 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-09-08" elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]]; then # beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2021-08-18" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26" elif [[ $@ =~ .*pilotpi.arm64 ]]; then # scumaker_pilotpi_arm64 PX4_DOCKER_REPO="px4io/px4-dev-aarch64:latest" elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # posix_rpi_cross, posix_bebop_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2021-08-18" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools PX4_DOCKER_REPO="px4io/px4-dev-clang:2021-02-04"