Skip to content

Commit

Permalink
update px4 dev containers to 2019-02-09
Browse files Browse the repository at this point in the history
  • Loading branch information
dagar committed Feb 9, 2019
1 parent 795e13c commit 0568535
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile-SITL_tests
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
stage('Build') {
agent {
docker {
image 'px4io/px4-dev-ros-kinetic:2018-09-11'
image 'px4io/px4-dev-ros-kinetic:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE --cap-add SYS_PTRACE --entrypoint=""'
}
}
Expand Down Expand Up @@ -109,7 +109,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE --entrypoint=""') {
docker.image("px4io/px4-dev-ros-kinetic:2019-02-09").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE') {
stage(test_def.name) {
def test_ok = true
sh('export')
Expand Down
6 changes: 3 additions & 3 deletions .ci/Jenkinsfile-SITL_tests_coverage
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pipeline {
stage('code coverage (python)') {
agent {
docker {
image 'px4io/px4-dev-base:2019-02-03'
image 'px4io/px4-dev-base:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -91,7 +91,7 @@ pipeline {
stage('unit tests') {
agent {
docker {
image 'px4io/px4-dev-base:2019-02-03'
image 'px4io/px4-dev-base:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -128,7 +128,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE --entrypoint=""') {
docker.image("px4io/px4-dev-ros-kinetic:2019-02-09").inside('-e HOME=${WORKSPACE} --cap-add SYS_PTRACE') {
stage(test_def.name) {
def test_ok = true
sh('export')
Expand Down
12 changes: 6 additions & 6 deletions .ci/Jenkinsfile-compile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
armhf: "px4io/px4-dev-armhf:2019-01-27",
base: "px4io/px4-dev-base:2019-01-26",
nuttx: "px4io/px4-dev-nuttx:2019-01-27",
ros: "px4io/px4-dev-ros:2019-01-27",
rpi: "px4io/px4-dev-raspi:2019-01-27",
armhf: "px4io/px4-dev-armhf:2019-02-09",
base: "px4io/px4-dev-base:2019-02-09",
nuttx: "px4io/px4-dev-nuttx:2019-02-09",
ros: "px4io/px4-dev-ros-kinetic:2019-02-09",
rpi: "px4io/px4-dev-raspi:2019-02-09",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]

Expand Down Expand Up @@ -81,7 +81,7 @@ pipeline {
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
options {
skipDefaultCheckout()
Expand Down
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile-hardware
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
stage('px4_fmu-v4_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-03'
image 'px4io/px4-dev-nuttx:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down
44 changes: 22 additions & 22 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pipeline {
stage('Catkin build on ROS workspace') {
agent {
docker {
image 'px4io/px4-dev-ros:2019-01-27'
image 'px4io/px4-dev-ros-kinetic:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -44,7 +44,7 @@ pipeline {
stage('Colcon build on ROS2 workspace') {
agent {
docker {
image 'px4io/px4-dev-ros2-bouncy:2019-01-27'
image 'px4io/px4-dev-ros2-bouncy:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -73,7 +73,7 @@ pipeline {

stage('Style check') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh 'make check_format'
Expand All @@ -88,7 +88,7 @@ pipeline {
stage('Bloaty px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-27'
image 'px4io/px4-dev-nuttx:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -116,7 +116,7 @@ pipeline {
stage('Bloaty px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-27'
image 'px4io/px4-dev-nuttx:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -144,7 +144,7 @@ pipeline {
stage('SITL unit tests') {
agent {
docker {
image 'px4io/px4-dev-base:2019-02-03'
image 'px4io/px4-dev-base:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -166,7 +166,7 @@ pipeline {
stage('Clang analyzer') {
agent {
docker {
image 'px4io/px4-dev-clang:2019-01-27'
image 'px4io/px4-dev-clang:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ pipeline {
// stage('Clang tidy') {
// agent {
// docker {
// image 'px4io/px4-dev-clang:2019-01-27'
// image 'px4io/px4-dev-clang:2019-02-09'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// }
// }
Expand All @@ -224,7 +224,7 @@ pipeline {
stage('Cppcheck') {
agent {
docker {
image 'px4io/px4-dev-base:2019-01-26'
image 'px4io/px4-dev-base:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -261,7 +261,7 @@ pipeline {
stage('Check stack') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-27'
image 'px4io/px4-dev-nuttx:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -280,7 +280,7 @@ pipeline {
stage('ShellCheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-27'
image 'px4io/px4-dev-nuttx:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -299,7 +299,7 @@ pipeline {
stage('Module config validation') {
agent {
docker {
image 'px4io/px4-dev-base:2019-01-26'
image 'px4io/px4-dev-base:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -324,7 +324,7 @@ pipeline {

stage('Airframe') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh 'make distclean'
Expand All @@ -343,7 +343,7 @@ pipeline {

stage('Parameter') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh 'make distclean'
Expand All @@ -362,7 +362,7 @@ pipeline {

stage('Module') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh 'make distclean'
Expand All @@ -382,7 +382,7 @@ pipeline {
stage('uORB graphs') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-27'
image 'px4io/px4-dev-nuttx:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -411,7 +411,7 @@ pipeline {

stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh('export')
Expand Down Expand Up @@ -441,7 +441,7 @@ pipeline {

stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh('export')
Expand Down Expand Up @@ -469,7 +469,7 @@ pipeline {

stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh('export')
Expand Down Expand Up @@ -497,7 +497,7 @@ pipeline {

stage('PX4 ROS msgs') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-27' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh('export')
Expand All @@ -520,7 +520,7 @@ pipeline {

stage('PX4 ROS2 bridge') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-27' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh('export')
Expand Down Expand Up @@ -551,7 +551,7 @@ pipeline {

stage('S3') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
steps {
sh('export')
Expand Down
12 changes: 6 additions & 6 deletions Tools/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@ 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:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-02-09"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
elif [[ $@ =~ .*ocpoc.* ]]; then
# aerotennaocpoc_ubuntu
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-02-09"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-02-09"
elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-02-09"
fi
else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
fi

# otherwise default to nuttx
if [ -z ${PX4_DOCKER_REPO+x} ]; then
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09"
fi

# docker hygiene
Expand Down

0 comments on commit 0568535

Please sign in to comment.