Browse Source

ci: update container versions to 2021-09-08

Signed-off-by: Jukka Laitinen <jukkax@ssrc.tii.ae>
master
Jukka Laitinen 3 years ago committed by Beat Küng
parent
commit
ffa5abbd65
  1. 10
      .ci/Jenkinsfile-compile
  2. 22
      .ci/Jenkinsfile-hardware
  3. 2
      .devcontainer/devcontainer.json
  4. 2
      .github/workflows/checks.yml
  5. 2
      .github/workflows/clang-tidy.yml
  6. 2
      .github/workflows/compile_linux.yml
  7. 2
      .github/workflows/compile_linux_arm64.yml
  8. 2
      .github/workflows/compile_nuttx.yml
  9. 2
      .github/workflows/compile_nuttx_cannode.yml
  10. 2
      .github/workflows/deploy_all.yml
  11. 2
      .github/workflows/ekf_functional_change_indicator.yml
  12. 2
      .github/workflows/ekf_update_change_indicator.yml
  13. 2
      .github/workflows/mavros_mission_tests.yml
  14. 2
      .github/workflows/mavros_offboard_tests.yml
  15. 16
      .github/workflows/metadata.yml
  16. 2
      .github/workflows/sitl_tests.yml
  17. 4
      Tools/docker_run.sh

10
.ci/Jenkinsfile-compile

@ -9,10 +9,10 @@ pipeline {
script { script {
def build_nodes = [:] def build_nodes = [:]
def docker_images = [ def docker_images = [
armhf: "px4io/px4-dev-armhf:2021-05-04", armhf: "px4io/px4-dev-armhf:2021-09-08",
arm64: "px4io/px4-dev-aarch64:2021-05-04", arm64: "px4io/px4-dev-aarch64:2021-09-08",
base: "px4io/px4-dev-base-bionic:2021-05-04", base: "px4io/px4-dev-base-bionic:2021-09-08",
nuttx: "px4io/px4-dev-nuttx-focal:2021-05-04", nuttx: "px4io/px4-dev-nuttx-focal:2021-09-08",
] ]
def armhf_builds = [ def armhf_builds = [
@ -127,7 +127,7 @@ pipeline {
// TODO: actually upload artifacts to S3 // TODO: actually upload artifacts to S3
// stage('S3 Upload') { // stage('S3 Upload') {
// agent { // agent {
// docker { image 'px4io/px4-dev-base-focal:2021-05-04' } // docker { image 'px4io/px4-dev-base-focal:2021-09-08' }
// } // }
// options { // options {
// skipDefaultCheckout() // skipDefaultCheckout()

22
.ci/Jenkinsfile-hardware

@ -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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -86,7 +86,7 @@ pipeline {
stage("build cuav_x7pro_test") { stage("build cuav_x7pro_test") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-focal:2021-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -158,7 +158,7 @@ pipeline {
stage("build px4_fmu-v3_test") { stage("build px4_fmu-v3_test") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-focal:2021-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -230,7 +230,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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -301,7 +301,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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -373,7 +373,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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -455,7 +455,7 @@ pipeline {
stage("build px4_fmu-v5_optimized") { stage("build px4_fmu-v5_optimized") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-focal:2021-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -527,7 +527,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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -609,7 +609,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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -681,7 +681,7 @@ pipeline {
// stage("build modalai_fc-v1_test") { // stage("build modalai_fc-v1_test") {
// agent { // agent {
// docker { // docker {
// image 'px4io/px4-dev-nuttx-focal:2021-05-04' // image 'px4io/px4-dev-nuttx-focal:2021-09-08'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// } // }
// } // }
@ -748,7 +748,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-05-04' image 'px4io/px4-dev-nuttx-focal:2021-09-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }

2
.devcontainer/devcontainer.json

@ -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-05-04", "image": "px4io/px4-dev-nuttx-focal:2021-09-08",
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

2
.github/workflows/checks.yml

@ -29,7 +29,7 @@ jobs:
"parameters_metadata", "parameters_metadata",
] ]
container: container:
image: px4io/px4-dev-nuttx-focal:2021-05-04 image: px4io/px4-dev-nuttx-focal:2021-09-08
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/clang-tidy.yml

@ -11,7 +11,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-clang:2021-05-04 container: px4io/px4-dev-clang:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

2
.github/workflows/compile_linux.yml

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

2
.github/workflows/compile_linux_arm64.yml

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

2
.github/workflows/compile_nuttx.yml

@ -11,7 +11,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx-focal:2021-05-04 container: px4io/px4-dev-nuttx-focal:2021-09-08
strategy: strategy:
matrix: matrix:
config: [ config: [

2
.github/workflows/compile_nuttx_cannode.yml

@ -11,7 +11,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx-focal:2021-05-04 container: px4io/px4-dev-nuttx-focal:2021-09-08
strategy: strategy:
matrix: matrix:
config: [ config: [

2
.github/workflows/deploy_all.yml

@ -23,7 +23,7 @@ jobs:
needs: enumerate_targets needs: enumerate_targets
strategy: strategy:
matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}} matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
container: px4io/px4-dev-${{ matrix.container }}:2021-05-04 container: px4io/px4-dev-${{ matrix.container }}:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

2
.github/workflows/ekf_functional_change_indicator.yml

@ -5,7 +5,7 @@ on: pull_request
jobs: jobs:
unit_tests: unit_tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v2.3.1 - uses: actions/checkout@v2.3.1
with: with:

2
.github/workflows/ekf_update_change_indicator.yml

@ -5,7 +5,7 @@ on: push
jobs: jobs:
unit_tests: unit_tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
env: env:
GIT_COMMITTER_EMAIL: bot@px4.io GIT_COMMITTER_EMAIL: bot@px4.io
GIT_COMMITTER_NAME: PX4BuildBot GIT_COMMITTER_NAME: PX4BuildBot

2
.github/workflows/mavros_mission_tests.yml

@ -25,7 +25,7 @@ jobs:
#- {vehicle: "tiltrotor", mission: "VTOL_mission_1", build_type: "RelWithDebInfo"} #- {vehicle: "tiltrotor", mission: "VTOL_mission_1", build_type: "RelWithDebInfo"}
container: container:
image: px4io/px4-dev-ros-melodic:2021-05-04 image: px4io/px4-dev-ros-melodic:2021-09-08
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/mavros_offboard_tests.yml

@ -20,7 +20,7 @@ jobs:
#- {test_file: "mavros_posix_tests_offboard_rpyrt_ctl.test", vehicle: "iris", build_type: "RelWithDebInfo"} #- {test_file: "mavros_posix_tests_offboard_rpyrt_ctl.test", vehicle: "iris", build_type: "RelWithDebInfo"}
container: container:
image: px4io/px4-dev-ros-melodic:2021-05-04 image: px4io/px4-dev-ros-melodic:2021-09-08
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

16
.github/workflows/metadata.yml

@ -11,7 +11,7 @@ jobs:
airframe: airframe:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -37,7 +37,7 @@ jobs:
module: module:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -52,7 +52,7 @@ jobs:
parameter: parameter:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -76,7 +76,7 @@ jobs:
events: events:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -103,7 +103,7 @@ jobs:
uorb_graph: uorb_graph:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx-focal:2021-05-04 container: px4io/px4-dev-nuttx-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -118,7 +118,7 @@ jobs:
micrortps_agent: micrortps_agent:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -132,7 +132,7 @@ jobs:
ROS_msgs: ROS_msgs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -145,7 +145,7 @@ jobs:
ROS2_bridge: ROS2_bridge:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2021-05-04 container: px4io/px4-dev-base-focal:2021-09-08
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

2
.github/workflows/sitl_tests.yml

@ -21,7 +21,7 @@ jobs:
- {latitude: "47.397742", longitude: "8.545594", altitude: "488", build_type: "Coverage", model: "standard_vtol" } # Zurich - {latitude: "47.397742", longitude: "8.545594", altitude: "488", build_type: "Coverage", model: "standard_vtol" } # Zurich
container: container:
image: px4io/px4-dev-simulation-focal:2021-05-04 image: px4io/px4-dev-simulation-focal:2021-09-08
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

4
Tools/docker_run.sh

@ -4,7 +4,7 @@ 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-05-04" PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-09-08"
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:2021-08-18" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2021-08-18"
@ -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-05-04" PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-09-08"
fi fi
# docker hygiene # docker hygiene

Loading…
Cancel
Save