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

docker update all to 2018-07-19 tagged image

This commit is contained in:
Daniel Agar 2018-07-21 13:26:10 -04:00
parent ec16a4d063
commit 8feac97399
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Jenkinsfile vendored
View File

@ -7,14 +7,14 @@ pipeline {
script { script {
def builds = [:] def builds = [:]
def docker_base = "px4io/px4-dev-base:2018-03-30" def docker_base = "px4io/px4-dev-base:2018-07-19"
def docker_nuttx = "px4io/px4-dev-nuttx:2018-03-30" def docker_nuttx = "px4io/px4-dev-nuttx:2018-07-19"
def docker_ros = "px4io/px4-dev-ros:2018-06-19" def docker_ros = "px4io/px4-dev-ros:2018-07-19"
def docker_rpi = "px4io/px4-dev-raspi:2018-03-30" def docker_rpi = "px4io/px4-dev-raspi:2018-07-19"
def docker_armhf = "px4io/px4-dev-armhf:2017-12-30" def docker_armhf = "px4io/px4-dev-armhf:2018-07-19"
def docker_arch = "px4io/px4-dev-base-archlinux:2018-03-30" def docker_arch = "px4io/px4-dev-base-archlinux:2018-07-19"
def docker_snapdragon = "lorenzmeier/px4-dev-snapdragon:2017-12-29" def docker_snapdragon = "lorenzmeier/px4-dev-snapdragon:2017-12-29"
def docker_clang = "px4io/px4-dev-clang:2018-03-30" def docker_clang = "px4io/px4-dev-clang:2018-07-19"
// fmu-v2_{default, lpe} and fmu-v3_{default, rtps} // fmu-v2_{default, lpe} and fmu-v3_{default, rtps}
// bloaty compare to last successful master build // bloaty compare to last successful master build
@ -142,7 +142,7 @@ pipeline {
stage('Style Check') { stage('Style Check') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-03-30' } docker { image 'px4io/px4-dev-base:2018-07-19' }
} }
steps { steps {
@ -153,7 +153,7 @@ pipeline {
stage('clang analyzer') { stage('clang analyzer') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2018-03-30' image 'px4io/px4-dev-clang:2018-07-19'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -232,7 +232,7 @@ pipeline {
stage('tests') { stage('tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base:2018-03-30' image 'px4io/px4-dev-base:2018-07-19'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -248,7 +248,7 @@ pipeline {
stage('test mission (code coverage)') { stage('test mission (code coverage)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -267,7 +267,7 @@ pipeline {
// stage('tests (address sanitizer)') { // stage('tests (address sanitizer)') {
// agent { // agent {
// docker { // docker {
// image 'px4io/px4-dev-base:2018-03-30' // image 'px4io/px4-dev-base:2018-07-19'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// } // }
// } // }
@ -287,7 +287,7 @@ pipeline {
// stage('tests (code coverage)') { // stage('tests (code coverage)') {
// agent { // agent {
// docker { // docker {
// image 'px4io/px4-dev-ros:2018-06-19' // image 'px4io/px4-dev-ros:2018-07-19'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// } // }
// } // }
@ -312,7 +312,7 @@ pipeline {
stage('check stack') { stage('check stack') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-03-30' image 'px4io/px4-dev-nuttx:2018-07-19'
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('ROS vtol standard mission') { stage('ROS vtol standard mission') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -361,7 +361,7 @@ pipeline {
stage('ROS vtol tailsitter mission') { stage('ROS vtol tailsitter mission') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -395,7 +395,7 @@ pipeline {
stage('ROS vtol tiltrotor mission') { stage('ROS vtol tiltrotor mission') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -429,7 +429,7 @@ pipeline {
stage('ROS vtol mission new 2') { stage('ROS vtol mission new 2') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -463,7 +463,7 @@ pipeline {
stage('ROS vtol mission old 1') { stage('ROS vtol mission old 1') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -497,7 +497,7 @@ pipeline {
stage('ROS vtol mission old 2') { stage('ROS vtol mission old 2') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -531,7 +531,7 @@ pipeline {
stage('ROS MC mission box (EKF2)') { stage('ROS MC mission box (EKF2)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -565,7 +565,7 @@ pipeline {
stage('ROS MC mission box (LPE)') { stage('ROS MC mission box (LPE)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -596,7 +596,7 @@ pipeline {
stage('ROS offboard att') { stage('ROS offboard att') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -630,7 +630,7 @@ pipeline {
stage('ROS offboard pos') { stage('ROS offboard pos') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-06-19' image 'px4io/px4-dev-ros:2018-07-19'
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'
} }
} }
@ -667,7 +667,7 @@ pipeline {
stage('airframe') { stage('airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-03-30' } docker { image 'px4io/px4-dev-base:2018-07-19' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -679,7 +679,7 @@ pipeline {
stage('parameter') { stage('parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-03-30' } docker { image 'px4io/px4-dev-base:2018-07-19' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -691,7 +691,7 @@ pipeline {
stage('module') { stage('module') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-03-30' } docker { image 'px4io/px4-dev-base:2018-07-19' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -704,7 +704,7 @@ pipeline {
stage('uorb graphs') { stage('uorb graphs') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-03-30' image 'px4io/px4-dev-nuttx:2018-07-19'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -722,7 +722,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:2018-03-30' } docker { image 'px4io/px4-dev-base:2018-07-19' }
} }
options { options {
skipDefaultCheckout() skipDefaultCheckout()

12
Tools/docker_run.sh
View File

@ -4,25 +4,25 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input"; echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then if [[ $@ =~ .*px4fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-03-30" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-07-19"
elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-03-30" PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-07-19"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29"
elif [[ $@ =~ .*ocpoc.* ]]; then elif [[ $@ =~ .*ocpoc.* ]]; then
# posix_ocpoc_ubuntu # posix_ocpoc_ubuntu
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2018-07-19"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-03-30" PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-07-19"
elif [[ $@ =~ .*cppcheck.* ]]; then elif [[ $@ =~ .*cppcheck.* ]]; then
# TODO: remove this once px4io/px4-dev-base updates # TODO: remove this once px4io/px4-dev-base updates
PX4_DOCKER_REPO="px4io/px4-dev-base:ubuntu17.10" PX4_DOCKER_REPO="px4io/px4-dev-base:ubuntu17.10"
elif [[ $@ =~ .*tests* ]]; then elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation # run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-03-30" PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-07-19"
fi fi
else else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@ -30,7 +30,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:2018-03-30" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-07-19"
fi fi
# docker hygiene # docker hygiene