Skip to content

Commit

Permalink
update all docker tags 2019-03-08 -> 2019-07-29
Browse files Browse the repository at this point in the history
  • Loading branch information
dagar committed Aug 5, 2019
1 parent 030508a commit cfdabb2
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 50 deletions.
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile-SITL_tests_ASan
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:2019-03-08'
image 'px4io/px4-dev-ros-kinetic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -117,7 +117,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-kinetic:2019-07-29").inside('-e HOME=${WORKSPACE}') {
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 @@ -79,7 +79,7 @@ pipeline {
stage('code coverage (python)') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-03-08'
image 'px4io/px4-dev-base-bionic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -99,7 +99,7 @@ pipeline {
stage('unit tests') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-03-08'
image 'px4io/px4-dev-base-bionic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-kinetic:2019-07-29").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def test_ok = true
sh('export')
Expand Down
11 changes: 5 additions & 6 deletions .ci/Jenkinsfile-compile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
armhf: "px4io/px4-dev-armhf:2019-03-08",
base: "px4io/px4-dev-base-bionic:2019-03-08",
nuttx: "px4io/px4-dev-nuttx:2019-03-08",
ros: "px4io/px4-dev-ros-kinetic:2019-03-08",
rpi: "px4io/px4-dev-raspi:2019-03-08",
armhf: "px4io/px4-dev-armhf:2019-07-29",
base: "px4io/px4-dev-base-bionic:2019-07-29",
nuttx: "px4io/px4-dev-nuttx:2019-07-29",
rpi: "px4io/px4-dev-raspi:2019-07-29",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]

Expand Down Expand Up @@ -82,7 +81,7 @@ pipeline {
// TODO: actually upload artifacts to S3
// stage('S3 Upload') {
// agent {
// docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
// docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
// }
// options {
// skipDefaultCheckout()
Expand Down
14 changes: 7 additions & 7 deletions .ci/Jenkinsfile-hardware
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pipeline {
stage('px4_fmu-v2_test') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -35,7 +35,7 @@ pipeline {
stage('px4_fmu-v3_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -59,7 +59,7 @@ pipeline {
stage('px4_fmu-v4_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -83,7 +83,7 @@ pipeline {
stage('px4_fmu-v4pro_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -107,7 +107,7 @@ pipeline {
stage('px4_fmu-v5_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -131,7 +131,7 @@ pipeline {
stage('px4_fmu-v5_stackcheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -155,7 +155,7 @@ pipeline {
stage('nxp_fmuk66-v3_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down
50 changes: 25 additions & 25 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pipeline {
stage('Catkin build on ROS workspace') {
agent {
docker {
image 'px4io/px4-dev-ros-melodic:2019-03-08'
image 'px4io/px4-dev-ros-melodic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -51,7 +51,7 @@ pipeline {
stage('Colcon build on ROS2 workspace') {
agent {
docker {
image 'px4io/px4-dev-ros2-bouncy:2019-03-08'
image 'px4io/px4-dev-ros2-bouncy:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
Expand Down Expand Up @@ -82,7 +82,7 @@ pipeline {

stage('Style check') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh 'make check_format'
Expand All @@ -97,7 +97,7 @@ pipeline {
stage('Bloaty px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@ pipeline {
stage('Bloaty px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -153,7 +153,7 @@ pipeline {
stage('No-ninja px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -175,7 +175,7 @@ pipeline {
stage('No-ninja px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -197,7 +197,7 @@ pipeline {
stage('No-ninja SITL build') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-03-08'
image 'px4io/px4-dev-base-bionic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -219,7 +219,7 @@ pipeline {
stage('SITL unit tests') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-03-08'
image 'px4io/px4-dev-base-bionic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -241,7 +241,7 @@ pipeline {
stage('Clang analyzer') {
agent {
docker {
image 'px4io/px4-dev-clang:2019-03-08'
image 'px4io/px4-dev-clang:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -279,7 +279,7 @@ pipeline {
// stage('Clang tidy') {
// agent {
// docker {
// image 'px4io/px4-dev-clang:2019-03-08'
// image 'px4io/px4-dev-clang:2019-07-29'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// }
// }
Expand All @@ -300,7 +300,7 @@ pipeline {
stage('Cppcheck') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-03-08'
image 'px4io/px4-dev-base-bionic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -338,7 +338,7 @@ pipeline {
stage('Check stack') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -358,7 +358,7 @@ pipeline {
stage('ShellCheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -377,7 +377,7 @@ pipeline {
stage('Module config validation') {
agent {
docker {
image 'px4io/px4-dev-base-bionic:2019-03-08'
image 'px4io/px4-dev-base-bionic:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand All @@ -402,7 +402,7 @@ pipeline {

stage('Airframe') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh 'make distclean'
Expand All @@ -421,7 +421,7 @@ pipeline {

stage('Parameter') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh 'make distclean'
Expand All @@ -440,7 +440,7 @@ pipeline {

stage('Module') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh 'make distclean'
Expand All @@ -460,7 +460,7 @@ pipeline {
stage('uORB graphs') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-03-08'
image 'px4io/px4-dev-nuttx:2019-07-29'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
Expand Down Expand Up @@ -489,7 +489,7 @@ pipeline {

stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh('export')
Expand Down Expand Up @@ -519,7 +519,7 @@ pipeline {

stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh('export')
Expand Down Expand Up @@ -547,7 +547,7 @@ pipeline {

stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh('export')
Expand Down Expand Up @@ -575,7 +575,7 @@ pipeline {

stage('PX4 ROS msgs') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh('export')
Expand Down Expand Up @@ -604,7 +604,7 @@ pipeline {

stage('PX4 ROS2 bridge') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh('export')
Expand Down Expand Up @@ -635,7 +635,7 @@ pipeline {

stage('S3') {
agent {
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
docker { image 'px4io/px4-dev-base-bionic:2019-07-29' }
}
steps {
sh('export')
Expand Down
14 changes: 7 additions & 7 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-03-08"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-07-29"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-03-08"
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-07-29"
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-03-08"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-07-29"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-03-08"
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-07-29"
elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-03-08"
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-07-29"
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-03-08"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-07-29"
fi

# docker hygiene
Expand Down

0 comments on commit cfdabb2

Please sign in to comment.