dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

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.
This commit is contained in:
Matthias Grob 2023-07-18 19:26:38 +02:00 committed by Ramon Roche
parent 39ab1f5809
commit 0c2a8266bc
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.ci/Jenkinsfile-hardware
View File

@ -12,7 +12,7 @@ pipeline {
stage("build cubepilot_cubeorange_test") { stage("build cubepilot_cubeorange_test") {
agent { agent {
docker { 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' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -91,7 +91,7 @@ pipeline {
stage("build cuav_x7pro_test") { stage("build cuav_x7pro_test") {
agent { agent {
docker { 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' 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") { stage("build px4_fmu-v4_test") {
agent { agent {
docker { 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' 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") { stage("build px4_fmu-v4pro_test") {
agent { agent {
docker { 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' 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") { stage("build px4_fmu-v5_debug") {
agent { agent {
docker { 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' 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") { stage("build px4_fmu-v5_stackcheck") {
agent { agent {
docker { 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' 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") { stage("build px4_fmu-v5_test") {
agent { agent {
docker { 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' 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") { stage("build nxp_fmuk66-v3_test") {
agent { agent {
docker { 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' args '--cpu-shares 512 -e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }

2
.devcontainer/devcontainer.json
View File

@ -2,7 +2,7 @@
// https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
{ {
"name": "px4-dev-nuttx", "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" ], "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

2
.github/workflows/checks.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
"parameters_metadata", "parameters_metadata",
] ]
container: 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 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

2
.github/workflows/compile_linux_arm64.yml vendored
View File

@ -11,7 +11,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-aarch64:2021-09-08 container: px4io/px4-dev-aarch64:2022-08-12
strategy: strategy:
matrix: matrix:
config: [ config: [

2
.github/workflows/compile_nuttx.yml vendored
View File

@ -11,7 +11,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx-focal:2021-09-08 container: px4io/px4-dev-nuttx-focal:2022-08-12
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:

2
.github/workflows/failsafe_sim.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
"failsafe_web", "failsafe_web",
] ]
container: 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 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

2
.github/workflows/metadata.yml vendored
View File

@ -103,7 +103,7 @@ jobs:
uorb_graph: uorb_graph:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx-focal:2021-09-08 container: px4io/px4-dev-nuttx-focal:2022-08-12
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

4
Jenkinsfile vendored
View File

@ -94,7 +94,7 @@ pipeline {
stage('failsafe docs') { stage('failsafe docs') {
agent { agent {
docker { image 'px4io/px4-dev-nuttx-focal:2021-08-18' } docker { image 'px4io/px4-dev-nuttx-focal:2022-08-12' }
} }
steps { steps {
sh '''#!/bin/bash -l sh '''#!/bin/bash -l
@ -125,7 +125,7 @@ pipeline {
stage('uORB graphs') { stage('uORB graphs') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }

6
Tools/docker_run.sh
View File

@ -4,13 +4,13 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input"; echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4_fmu.* ]]; then if [[ $@ =~ .*px4_fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # 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 elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]]; then
# beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default # beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26"
elif [[ $@ =~ .*pilotpi.arm64 ]]; then elif [[ $@ =~ .*pilotpi.arm64 ]]; then
# scumaker_pilotpi_arm64 # 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 elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26"
@ -27,7 +27,7 @@ fi
# otherwise default to nuttx # otherwise default to nuttx
if [ -z ${PX4_DOCKER_REPO+x} ]; then 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 fi
# docker hygiene # docker hygiene