zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

sbg
Daniel Agar 4 years ago
parent
41a2fe5bdf
commit
d61fd0e4ca
9 changed files with 37 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .ci/Jenkinsfile-compile
  2. 22
      .ci/Jenkinsfile-hardware
  3. 2
      .devcontainer/devcontainer.json
  4. 6
      .github/workflows/checks.yml
  5. 2
      .github/workflows/compile_nuttx.yml
  6. 2
      .github/workflows/coverage.yml
  7. 14
      .github/workflows/metadata.yml
  8. 22
      Jenkinsfile
  9. 4
      Tools/docker_run.sh

4
.ci/Jenkinsfile-compile
Unescape View File

@ -11,7 +11,7 @@ pipeline { @@ -11,7 +11,7 @@ pipeline {
def docker_images = [
armhf: "px4io/px4-dev-armhf: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"
]
@ -108,7 +108,7 @@ pipeline { @@ -108,7 +108,7 @@ pipeline {
// TODO: actually upload artifacts to S3
// stage('S3 Upload') {
// agent {
// docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
// docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
// }
// options {
// skipDefaultCheckout()

22
.ci/Jenkinsfile-hardware
Unescape View File

@ -12,7 +12,7 @@ pipeline { @@ -12,7 +12,7 @@ pipeline {
stage("build px4_fmu-v2_test") {
agent {
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'
}
}
@ -80,7 +80,7 @@ pipeline { @@ -80,7 +80,7 @@ pipeline {
stage("build px4_fmu-v3_default") {
agent {
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'
}
}
@ -154,7 +154,7 @@ pipeline { @@ -154,7 +154,7 @@ pipeline {
stage("build px4_fmu-v4_default") {
agent {
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'
}
}
@ -227,7 +227,7 @@ pipeline { @@ -227,7 +227,7 @@ pipeline {
stage("build px4_fmu-v4pro_default") {
agent {
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'
}
}
@ -301,7 +301,7 @@ pipeline { @@ -301,7 +301,7 @@ pipeline {
stage("build px4_fmu-v5_default") {
agent {
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'
}
}
@ -376,7 +376,7 @@ pipeline { @@ -376,7 +376,7 @@ pipeline {
stage("build px4_fmu-v5_debug") {
agent {
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'
}
}
@ -451,7 +451,7 @@ pipeline { @@ -451,7 +451,7 @@ pipeline {
stage("build px4_fmu-v5_optimized") {
agent {
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'
}
}
@ -524,7 +524,7 @@ pipeline { @@ -524,7 +524,7 @@ pipeline {
stage("build px4_fmu-v5_stackcheck") {
agent {
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'
}
}
@ -599,7 +599,7 @@ pipeline { @@ -599,7 +599,7 @@ pipeline {
stage("build modalai_fc-v1_default") {
agent {
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'
}
}
@ -672,7 +672,7 @@ pipeline { @@ -672,7 +672,7 @@ pipeline {
stage("build holybro_durandal-v1_default") {
agent {
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'
}
}
@ -751,7 +751,7 @@ pipeline { @@ -751,7 +751,7 @@ pipeline {
stage("build nxp_fmuk66-v3_default") {
agent {
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'
}
}

2
.devcontainer/devcontainer.json
Unescape View File

@ -2,7 +2,7 @@ @@ -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-bionic:2020-04-01",
"image": "px4io/px4-dev-nuttx-focal:2020-09-14",
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

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

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

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

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

2
.github/workflows/coverage.yml
Unescape View File

@ -11,7 +11,7 @@ on: @@ -11,7 +11,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: px4io/px4-dev-base-focal:2020-08-14
container: px4io/px4-dev-base-focal:2020-09-14
strategy:
matrix:
config: [

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

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

22
Jenkinsfile vendored
Unescape View File

@ -87,7 +87,7 @@ pipeline { @@ -87,7 +87,7 @@ pipeline {
stage('Airframe') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh 'make distclean'
@ -106,7 +106,7 @@ pipeline { @@ -106,7 +106,7 @@ pipeline {
stage('Parameter') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh 'make distclean'
@ -125,7 +125,7 @@ pipeline { @@ -125,7 +125,7 @@ pipeline {
stage('Module') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh 'make distclean'
@ -145,7 +145,7 @@ pipeline { @@ -145,7 +145,7 @@ pipeline {
stage('uORB graphs') {
agent {
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'
}
}
@ -174,7 +174,7 @@ pipeline { @@ -174,7 +174,7 @@ pipeline {
stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')
@ -204,7 +204,7 @@ pipeline { @@ -204,7 +204,7 @@ pipeline {
stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')
@ -232,7 +232,7 @@ pipeline { @@ -232,7 +232,7 @@ pipeline {
stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')
@ -260,7 +260,7 @@ pipeline { @@ -260,7 +260,7 @@ pipeline {
stage('microRTPS agent') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')
@ -290,7 +290,7 @@ pipeline { @@ -290,7 +290,7 @@ pipeline {
stage('PX4 ROS msgs') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')
@ -319,7 +319,7 @@ pipeline { @@ -319,7 +319,7 @@ pipeline {
stage('PX4 ROS2 bridge') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')
@ -362,7 +362,7 @@ pipeline { @@ -362,7 +362,7 @@ pipeline {
stage('S3') {
agent {
docker { image 'px4io/px4-dev-base-focal:2020-08-20' }
docker { image 'px4io/px4-dev-base-focal:2020-09-14' }
}
steps {
sh('export')

4
Tools/docker_run.sh
Unescape View File

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

Write Preview
Loading…
Cancel
Save