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

update all px4-dev-base and px4-dev-nuttx container usage uniformly

This commit is contained in:
Daniel Agar 2020-09-18 12:17:51 -04:00
parent 41a2fe5bdf
commit d61fd0e4ca
9 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/Jenkinsfile-compile
View File

@ -11,7 +11,7 @@ pipeline {
def docker_images = [ def docker_images = [
armhf: "px4io/px4-dev-armhf:2020-04-01", armhf: "px4io/px4-dev-armhf:2020-04-01",
base: "px4io/px4-dev-base-bionic:2020-04-01", base: "px4io/px4-dev-base-bionic:2020-04-01",
nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-01", nuttx: "px4io/px4-dev-nuttx-focal:2020-09-14",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01" snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
] ]
@ -108,7 +108,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-bionic:2020-04-01' } // docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
// } // }
// options { // options {
// skipDefaultCheckout() // skipDefaultCheckout()

22
.ci/Jenkinsfile-hardware
View File

@ -12,7 +12,7 @@ pipeline {
stage("build px4_fmu-v2_test") { stage("build px4_fmu-v2_test") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -80,7 +80,7 @@ pipeline {
stage("build px4_fmu-v3_default") { stage("build px4_fmu-v3_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -154,7 +154,7 @@ pipeline {
stage("build px4_fmu-v4_default") { stage("build px4_fmu-v4_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -227,7 +227,7 @@ pipeline {
stage("build px4_fmu-v4pro_default") { stage("build px4_fmu-v4pro_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
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-v5_default") { stage("build px4_fmu-v5_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -376,7 +376,7 @@ pipeline {
stage("build px4_fmu-v5_debug") { stage("build px4_fmu-v5_debug") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -451,7 +451,7 @@ pipeline {
stage("build px4_fmu-v5_optimized") { stage("build px4_fmu-v5_optimized") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -524,7 +524,7 @@ pipeline {
stage("build px4_fmu-v5_stackcheck") { stage("build px4_fmu-v5_stackcheck") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -599,7 +599,7 @@ pipeline {
stage("build modalai_fc-v1_default") { stage("build modalai_fc-v1_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -672,7 +672,7 @@ pipeline {
stage("build holybro_durandal-v1_default") { stage("build holybro_durandal-v1_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -751,7 +751,7 @@ pipeline {
stage("build nxp_fmuk66-v3_default") { stage("build nxp_fmuk66-v3_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-04-01' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
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
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-bionic:2020-04-01", "image": "px4io/px4-dev-nuttx-focal:2020-09-14",
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

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

@ -26,11 +26,7 @@ jobs:
"module_documentation", "module_documentation",
"parameters_metadata", "parameters_metadata",
] ]
ubuntu_release: [ container: px4io/px4-dev-nuttx-focal:2020-09-14
#bionic,
focal
]
container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-08-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

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-bionic:2020-08-14 container: px4io/px4-dev-nuttx-focal:2020-09-14
strategy: strategy:
matrix: matrix:
config: [ config: [

2
.github/workflows/coverage.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-base-focal:2020-08-14 container: px4io/px4-dev-base-focal:2020-09-14
strategy: strategy:
matrix: matrix:
config: [ config: [

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

@ -12,7 +12,7 @@ jobs:
airframe: airframe:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2020-08-14 container: px4io/px4-dev-base-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -27,7 +27,7 @@ jobs:
module: module:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2020-08-14 container: px4io/px4-dev-base-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -42,7 +42,7 @@ jobs:
parameter: parameter:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2020-08-14 container: px4io/px4-dev-base-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -57,7 +57,7 @@ jobs:
uorb_graph: uorb_graph:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-nuttx-focal:2020-08-14 container: px4io/px4-dev-nuttx-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -72,7 +72,7 @@ jobs:
micrortps_agent: micrortps_agent:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-bionic:2020-04-01 container: px4io/px4-dev-base-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -86,7 +86,7 @@ jobs:
ROS_msgs: ROS_msgs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-bionic:2020-08-14 container: px4io/px4-dev-base-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
@ -99,7 +99,7 @@ jobs:
ROS2_bridge: ROS2_bridge:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-bionic:2020-08-14 container: px4io/px4-dev-base-focal:2020-09-14
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

22
Jenkinsfile vendored
View File

@ -87,7 +87,7 @@ pipeline {
stage('Airframe') { stage('Airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -106,7 +106,7 @@ pipeline {
stage('Parameter') { stage('Parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -125,7 +125,7 @@ pipeline {
stage('Module') { stage('Module') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -145,7 +145,7 @@ pipeline {
stage('uORB graphs') { stage('uORB graphs') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-focal:2020-08-20' image 'px4io/px4-dev-nuttx-focal:2020-09-14'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -174,7 +174,7 @@ pipeline {
stage('Devguide') { stage('Devguide') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')
@ -204,7 +204,7 @@ pipeline {
stage('Userguide') { stage('Userguide') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')
@ -232,7 +232,7 @@ pipeline {
stage('QGroundControl') { stage('QGroundControl') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')
@ -260,7 +260,7 @@ pipeline {
stage('microRTPS agent') { stage('microRTPS agent') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')
@ -290,7 +290,7 @@ pipeline {
stage('PX4 ROS msgs') { stage('PX4 ROS msgs') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')
@ -319,7 +319,7 @@ pipeline {
stage('PX4 ROS2 bridge') { stage('PX4 ROS2 bridge') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')
@ -362,7 +362,7 @@ pipeline {
stage('S3') { stage('S3') {
agent { agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' } docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
} }
steps { steps {
sh('export') sh('export')

4
Tools/docker_run.sh
View File

@ -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-bionic:2020-04-01" PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-09-14"
elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]]; then elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]]; then
# aerotenna_ocpoc_default, beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default # aerotenna_ocpoc_default, beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01"
@ -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-bionic:2020-04-01" PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-09-14"
fi fi
# docker hygiene # docker hygiene