From 0c2a8266bcb7c724bd0b3a55e28befecd3e4307b Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Tue, 18 Jul 2023 19:26:38 +0200 Subject: [PATCH] CI: use the same container versions consistently I updated all versions to the newest one that's used anywhere. Then at least the straing can be found with full text search. It's another step towards understanding and unifying the CI environment. --- .ci/Jenkinsfile-hardware | 16 ++++++++-------- .devcontainer/devcontainer.json | 2 +- .github/workflows/checks.yml | 2 +- .github/workflows/compile_linux_arm64.yml | 2 +- .github/workflows/compile_nuttx.yml | 2 +- .github/workflows/failsafe_sim.yml | 2 +- .github/workflows/metadata.yml | 2 +- Jenkinsfile | 4 ++-- Tools/docker_run.sh | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index bb1b8f8a73..5883a93037 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -12,7 +12,7 @@ pipeline { stage("build cubepilot_cubeorange_test") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -91,7 +91,7 @@ pipeline { stage("build cuav_x7pro_test") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -165,7 +165,7 @@ pipeline { stage("build px4_fmu-v4_test") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -238,7 +238,7 @@ pipeline { stage("build px4_fmu-v4pro_test") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -312,7 +312,7 @@ pipeline { stage("build px4_fmu-v5_debug") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -403,7 +403,7 @@ pipeline { stage("build px4_fmu-v5_stackcheck") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -486,7 +486,7 @@ pipeline { stage("build px4_fmu-v5_test") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -560,7 +560,7 @@ pipeline { stage("build nxp_fmuk66-v3_test") { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-09-08' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b0914106ed..c53467ab8c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp { "name": "px4-dev-nuttx", - "image": "px4io/px4-dev-nuttx-focal:2021-09-08", + "image": "px4io/px4-dev-nuttx-focal:2022-08-12", "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ef15d32171..f8a893e747 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -28,7 +28,7 @@ jobs: "parameters_metadata", ] container: - image: px4io/px4-dev-nuttx-focal:2021-09-08 + image: px4io/px4-dev-nuttx-focal:2022-08-12 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/compile_linux_arm64.yml b/.github/workflows/compile_linux_arm64.yml index 81ecc12569..4feaab0f4a 100644 --- a/.github/workflows/compile_linux_arm64.yml +++ b/.github/workflows/compile_linux_arm64.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-aarch64:2021-09-08 + container: px4io/px4-dev-aarch64:2022-08-12 strategy: matrix: config: [ diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 67b055fdd9..4951baad37 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx-focal:2021-09-08 + container: px4io/px4-dev-nuttx-focal:2022-08-12 strategy: fail-fast: false matrix: diff --git a/.github/workflows/failsafe_sim.yml b/.github/workflows/failsafe_sim.yml index 6d5e73d5a5..4d2ed21728 100644 --- a/.github/workflows/failsafe_sim.yml +++ b/.github/workflows/failsafe_sim.yml @@ -21,7 +21,7 @@ jobs: "failsafe_web", ] container: - image: px4io/px4-dev-nuttx-focal:2021-09-08 + image: px4io/px4-dev-nuttx-focal:2022-08-12 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml index 10799ba38f..e7289b34f7 100644 --- a/.github/workflows/metadata.yml +++ b/.github/workflows/metadata.yml @@ -103,7 +103,7 @@ jobs: uorb_graph: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx-focal:2021-09-08 + container: px4io/px4-dev-nuttx-focal:2022-08-12 steps: - uses: actions/checkout@v1 with: diff --git a/Jenkinsfile b/Jenkinsfile index a983c043c0..30683ffe16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,7 @@ pipeline { stage('failsafe docs') { agent { - docker { image 'px4io/px4-dev-nuttx-focal:2021-08-18' } + docker { image 'px4io/px4-dev-nuttx-focal:2022-08-12' } } steps { sh '''#!/bin/bash -l @@ -125,7 +125,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2021-08-18' + image 'px4io/px4-dev-nuttx-focal:2022-08-12' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index a90314e207..c78b9cc7e1 100755 --- a/Tools/docker_run.sh +++ b/Tools/docker_run.sh @@ -4,13 +4,13 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then echo "guessing PX4_DOCKER_REPO based on input"; if [[ $@ =~ .*px4_fmu.* ]]; then # nuttx-px4fmu-v{1,2,3,4,5} - PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-09-08" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2022-08-12" 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:2023-06-26" elif [[ $@ =~ .*pilotpi.arm64 ]]; then # scumaker_pilotpi_arm64 - PX4_DOCKER_REPO="px4io/px4-dev-aarch64:latest" + PX4_DOCKER_REPO="px4io/px4-dev-aarch64:2022-08-12" elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # posix_rpi_cross, posix_bebop_default PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26" @@ -27,7 +27,7 @@ fi # otherwise default to nuttx if [ -z ${PX4_DOCKER_REPO+x} ]; then - PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-09-08" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2022-08-12" fi # docker hygiene