yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: bump container tags to 2020-04-01

Browse Source
This commit is contained in:
TSC21
2020-04-02 11:23:40 +01:00
committed by Nuno Marques
parent 2020b77a43
commit e9aba642fe
14 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/Jenkinsfile-SITL_tests
View File

@@ -8,7 +8,7 @@ pipeline {
stage('Build') { stage('Build') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2020-03-29' image 'px4io/px4-dev-ros-melodic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -130,7 +130,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2020-03-29").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
def run_script = test_def.get('run_script', 'rostest_px4_run.sh') def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
def test_ok = true def test_ok = true

4
.ci/Jenkinsfile-SITL_tests_ASan
View File

@@ -8,7 +8,7 @@ pipeline {
stage('Build') { stage('Build') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2020-03-29' image 'px4io/px4-dev-ros-melodic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -131,7 +131,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2020-03-29").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
def run_script = test_def.get('run_script', 'rostest_px4_run.sh') def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
def test_ok = true def test_ok = true

6
.ci/Jenkinsfile-SITL_tests_coverage
View File

@@ -79,7 +79,7 @@ pipeline {
stage('code coverage (python)') { stage('code coverage (python)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2020-03-29' image 'px4io/px4-dev-base-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -99,7 +99,7 @@ pipeline {
stage('unit tests') { stage('unit tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2020-03-29' image 'px4io/px4-dev-base-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2020-03-29").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-melodic:2020-04-01").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
def test_ok = true def test_ok = true
sh('export') sh('export')

12
.ci/Jenkinsfile-compile
View File

@@ -9,10 +9,10 @@ pipeline {
script { script {
def build_nodes = [:] def build_nodes = [:]
def docker_images = [ def docker_images = [
armhf: "px4io/px4-dev-armhf:2020-03-29", armhf: "px4io/px4-dev-armhf:2020-04-01",
base: "px4io/px4-dev-base-bionic:2020-03-29", base: "px4io/px4-dev-base-bionic:2020-04-01",
nuttx: "px4io/px4-dev-nuttx-bionic:2020-03-29", nuttx: "px4io/px4-dev-nuttx-bionic:2020-04-01",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-03-29" snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
] ]
def armhf_builds = [ def armhf_builds = [
@@ -98,7 +98,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-03-29' } // docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
// } // }
// options { // options {
// skipDefaultCheckout() // skipDefaultCheckout()
@@ -132,7 +132,7 @@ def createBuildNode(Boolean archive, String docker_image, String target) {
// TODO: fix the snapdragon image // TODO: fix the snapdragon image
bypass_entrypoint = '' bypass_entrypoint = ''
if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-03-29') { if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2020-04-01') {
bypass_entrypoint = ' --entrypoint=""' bypass_entrypoint = ' --entrypoint=""'
} }

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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -76,7 +76,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -149,7 +149,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -222,7 +222,7 @@ pipeline {
stage("build px4_fmu-v4_optimized") { stage("build px4_fmu-v4_optimized") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -295,7 +295,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -368,7 +368,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -441,7 +441,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -514,7 +514,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -587,7 +587,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-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -661,7 +661,7 @@ pipeline {
stage("build holybro_durandal-v1_stackcheck") { stage("build holybro_durandal-v1_stackcheck") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
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_default") { stage("build nxp_fmuk66-v3_default") {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }

2
.circleci/config.yml
View File

@@ -2,7 +2,7 @@ version: 2
jobs: jobs:
build: build:
docker: docker:
- image: px4io/px4-dev-nuttx-bionic:2020-03-29 - image: px4io/px4-dev-nuttx-bionic:2020-04-01
steps: steps:
- checkout - checkout
- run: - run:

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

@@ -26,7 +26,7 @@ jobs:
px4_fmu-v5x_default, px4_fmu-v5x_default,
px4_io-v2_default, px4_io-v2_default,
] ]
container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-03-29 container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-04-01
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

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

@@ -17,7 +17,7 @@ jobs:
bionic, bionic,
focal focal
] ]
container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-03-29 container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-01
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

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

@@ -17,7 +17,7 @@ jobs:
bionic, bionic,
focal focal
] ]
container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-03-29 container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-04-01
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

2
.github/workflows/compile_linux.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-armhf:2020-03-29 container: px4io/px4-dev-armhf:2020-04-01
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-bionic:2020-03-29 container: px4io/px4-dev-nuttx-bionic:2020-04-01
strategy: strategy:
matrix: matrix:
config: [ config: [

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

@@ -17,7 +17,7 @@ jobs:
bionic, bionic,
focal focal
] ]
container: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-03-29 container: px4io/px4-dev-simulation-${{ matrix.ubuntu_release }}:2020-04-01
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:

44
Jenkinsfile vendored
View File

@@ -11,7 +11,7 @@ pipeline {
stage('Catkin build on ROS workspace') { stage('Catkin build on ROS workspace') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2020-03-29' image 'px4io/px4-dev-ros-melodic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -52,7 +52,7 @@ pipeline {
stage('Colcon build on ROS2 workspace') { stage('Colcon build on ROS2 workspace') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros2-dashing:2020-03-29' image 'px4io/px4-dev-ros2-dashing:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -83,7 +83,7 @@ pipeline {
stage('Style check') { stage('Style check') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh 'make check_format' sh 'make check_format'
@@ -98,7 +98,7 @@ pipeline {
stage('px4_fmu-v5 (no ninja)') { stage('px4_fmu-v5 (no ninja)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -124,7 +124,7 @@ pipeline {
stage('px4_sitl (no ninja)') { stage('px4_sitl (no ninja)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -150,7 +150,7 @@ pipeline {
stage('SITL unit tests') { stage('SITL unit tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2020-03-29' image 'px4io/px4-dev-base-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -190,7 +190,7 @@ pipeline {
stage('Clang analyzer') { stage('Clang analyzer') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2020-03-29' image 'px4io/px4-dev-clang:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -228,7 +228,7 @@ pipeline {
stage('Clang tidy') { stage('Clang tidy') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2020-03-29' image 'px4io/px4-dev-clang:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -250,7 +250,7 @@ pipeline {
stage('Cppcheck') { stage('Cppcheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2020-03-29' image 'px4io/px4-dev-ros-melodic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -288,7 +288,7 @@ pipeline {
stage('Check stack') { stage('Check stack') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -308,7 +308,7 @@ pipeline {
stage('ShellCheck') { stage('ShellCheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -327,7 +327,7 @@ pipeline {
stage('Module config validation') { stage('Module config validation') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2020-03-29' image 'px4io/px4-dev-base-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -352,7 +352,7 @@ pipeline {
stage('Airframe') { stage('Airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -371,7 +371,7 @@ pipeline {
stage('Parameter') { stage('Parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -390,7 +390,7 @@ pipeline {
stage('Module') { stage('Module') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -410,7 +410,7 @@ pipeline {
stage('uORB graphs') { stage('uORB graphs') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx-bionic:2020-03-29' image 'px4io/px4-dev-nuttx-bionic:2020-04-01'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -439,7 +439,7 @@ pipeline {
stage('Devguide') { stage('Devguide') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh('export') sh('export')
@@ -469,7 +469,7 @@ pipeline {
stage('Userguide') { stage('Userguide') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh('export') sh('export')
@@ -497,7 +497,7 @@ pipeline {
stage('QGroundControl') { stage('QGroundControl') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh('export') sh('export')
@@ -525,7 +525,7 @@ pipeline {
stage('PX4 ROS msgs') { stage('PX4 ROS msgs') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh('export') sh('export')
@@ -554,7 +554,7 @@ pipeline {
stage('PX4 ROS2 bridge') { stage('PX4 ROS2 bridge') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh('export') sh('export')
@@ -597,7 +597,7 @@ pipeline {
stage('S3') { stage('S3') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2020-03-29' } docker { image 'px4io/px4-dev-base-bionic:2020-04-01' }
} }
steps { steps {
sh('export') sh('export')

14
Tools/docker_run.sh
View File

@@ -4,22 +4,22 @@ 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-03-29" PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-01"
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-03-29" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-03-29" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-04-01"
elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default # aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-03-29" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-03-29" PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-04-01"
elif [[ $@ =~ .*tests* ]]; then elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation # run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-03-29" PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-04-01"
fi fi
else else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -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-03-29" PX4_DOCKER_REPO="px4io/px4-dev-nuttx-bionic:2020-04-01"
fi fi
# docker hygiene # docker hygiene