diff --git a/Jenkinsfile b/Jenkinsfile
index 6a98d4edc666c8b60592865b9808c2f2d37cc946..09a1c51e0d89830d0915b029e79bb16fe57794e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,14 +7,14 @@ pipeline {
script {
def builds = [:]
- def docker_base = "px4io/px4-dev-base:2018-03-30"
- def docker_nuttx = "px4io/px4-dev-nuttx:2018-03-30"
- def docker_ros = "px4io/px4-dev-ros:2018-06-19"
- def docker_rpi = "px4io/px4-dev-raspi:2018-03-30"
- def docker_armhf = "px4io/px4-dev-armhf:2017-12-30"
- def docker_arch = "px4io/px4-dev-base-archlinux:2018-03-30"
+ def docker_base = "px4io/px4-dev-base:2018-07-19"
+ def docker_nuttx = "px4io/px4-dev-nuttx:2018-07-19"
+ def docker_ros = "px4io/px4-dev-ros:2018-07-19"
+ def docker_rpi = "px4io/px4-dev-raspi:2018-07-19"
+ def docker_armhf = "px4io/px4-dev-armhf:2018-07-19"
+ def docker_arch = "px4io/px4-dev-base-archlinux:2018-07-19"
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}
// bloaty compare to last successful master build
@@ -142,7 +142,7 @@ pipeline {
stage('Style Check') {
agent {
- docker { image 'px4io/px4-dev-base:2018-03-30' }
+ docker { image 'px4io/px4-dev-base:2018-07-19' }
}
steps {
@@ -153,7 +153,7 @@ pipeline {
stage('clang analyzer') {
agent {
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'
}
}
@@ -232,7 +232,7 @@ pipeline {
stage('tests') {
agent {
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'
}
}
@@ -248,7 +248,7 @@ pipeline {
stage('test mission (code coverage)') {
agent {
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'
}
}
@@ -267,7 +267,7 @@ pipeline {
// stage('tests (address sanitizer)') {
// agent {
// 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'
// }
// }
@@ -287,7 +287,7 @@ pipeline {
// stage('tests (code coverage)') {
// agent {
// 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'
// }
// }
@@ -312,7 +312,7 @@ pipeline {
stage('check stack') {
agent {
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'
}
}
@@ -327,7 +327,7 @@ pipeline {
stage('ROS vtol standard mission') {
agent {
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'
}
}
@@ -361,7 +361,7 @@ pipeline {
stage('ROS vtol tailsitter mission') {
agent {
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'
}
}
@@ -395,7 +395,7 @@ pipeline {
stage('ROS vtol tiltrotor mission') {
agent {
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'
}
}
@@ -429,7 +429,7 @@ pipeline {
stage('ROS vtol mission new 2') {
agent {
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'
}
}
@@ -463,7 +463,7 @@ pipeline {
stage('ROS vtol mission old 1') {
agent {
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'
}
}
@@ -497,7 +497,7 @@ pipeline {
stage('ROS vtol mission old 2') {
agent {
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'
}
}
@@ -531,7 +531,7 @@ pipeline {
stage('ROS MC mission box (EKF2)') {
agent {
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'
}
}
@@ -565,7 +565,7 @@ pipeline {
stage('ROS MC mission box (LPE)') {
agent {
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'
}
}
@@ -596,7 +596,7 @@ pipeline {
stage('ROS offboard att') {
agent {
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'
}
}
@@ -630,7 +630,7 @@ pipeline {
stage('ROS offboard pos') {
agent {
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'
}
}
@@ -667,7 +667,7 @@ pipeline {
stage('airframe') {
agent {
- docker { image 'px4io/px4-dev-base:2018-03-30' }
+ docker { image 'px4io/px4-dev-base:2018-07-19' }
}
steps {
sh 'make distclean'
@@ -679,7 +679,7 @@ pipeline {
stage('parameter') {
agent {
- docker { image 'px4io/px4-dev-base:2018-03-30' }
+ docker { image 'px4io/px4-dev-base:2018-07-19' }
}
steps {
sh 'make distclean'
@@ -691,7 +691,7 @@ pipeline {
stage('module') {
agent {
- docker { image 'px4io/px4-dev-base:2018-03-30' }
+ docker { image 'px4io/px4-dev-base:2018-07-19' }
}
steps {
sh 'make distclean'
@@ -704,7 +704,7 @@ pipeline {
stage('uorb graphs') {
agent {
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'
}
}
@@ -722,7 +722,7 @@ pipeline {
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
- docker { image 'px4io/px4-dev-base:2018-03-30' }
+ docker { image 'px4io/px4-dev-base:2018-07-19' }
}
options {
skipDefaultCheckout()
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 403125a7b8ff728def25093468b5bd4ab1f8812c..8f8426814bd9ba2708ecba20b07706a5e61acf65 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -4,25 +4,25 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then
# 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
# 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
# eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29"
elif [[ $@ =~ .*ocpoc.* ]]; then
# 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
# 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
# TODO: remove this once px4io/px4-dev-base updates
PX4_DOCKER_REPO="px4io/px4-dev-base:ubuntu17.10"
elif [[ $@ =~ .*tests* ]]; then
# 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
else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -30,7 +30,7 @@ fi
# otherwise default to nuttx
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
# docker hygiene