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

update px4 dev containers to 2019-02-09 

- this updates all containers except for px4-dev-snapdragon
This commit is contained in:
Daniel Agar 2019-02-10 17:33:17 -05:00 committed by GitHub
parent 0b16e650b7
commit 05dc2ba3ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.ci/Jenkinsfile-SITL_tests
View File

@ -8,8 +8,8 @@ pipeline {
stage('Build') { stage('Build') {
agent { agent {
docker { 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=""' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
steps { steps {
@ -100,7 +100,7 @@ pipeline {
} }
options { options {
buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14')) buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '14'))
timeout(time: 60, unit: 'MINUTES') timeout(time: 60, unit: 'MINUTES')
} }
} // pipeline } // pipeline
@ -109,7 +109,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() 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}') {
stage(test_def.name) { stage(test_def.name) {
def test_ok = true def test_ok = true
sh('export') sh('export')

8
.ci/Jenkinsfile-SITL_tests_coverage
View File

@ -72,7 +72,7 @@ pipeline {
stage('code coverage (python)') { stage('code coverage (python)') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -91,7 +91,7 @@ pipeline {
stage('unit tests') { stage('unit tests') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -119,7 +119,7 @@ pipeline {
} }
options { options {
buildDiscarder(logRotator(numToKeepStr: '2', artifactDaysToKeepStr: '14')) buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
timeout(time: 60, unit: 'MINUTES') timeout(time: 60, unit: 'MINUTES')
} }
} // pipeline } // pipeline
@ -128,7 +128,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() 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}') {
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,11 +9,11 @@ pipeline {
script { script {
def build_nodes = [:] def build_nodes = [:]
def docker_images = [ def docker_images = [
armhf: "px4io/px4-dev-armhf:2019-01-27", armhf: "px4io/px4-dev-armhf:2019-02-09",
base: "px4io/px4-dev-base:2019-01-26", base: "px4io/px4-dev-base:2019-02-09",
nuttx: "px4io/px4-dev-nuttx:2019-01-27", nuttx: "px4io/px4-dev-nuttx:2019-02-09",
ros: "px4io/px4-dev-ros:2019-01-27", ros: "px4io/px4-dev-ros-kinetic:2019-02-09",
rpi: "px4io/px4-dev-raspi:2019-01-27", rpi: "px4io/px4-dev-raspi:2019-02-09",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
] ]
@ -81,7 +81,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:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
options { options {
skipDefaultCheckout() skipDefaultCheckout()

2
.ci/Jenkinsfile-hardware
View File

@ -9,7 +9,7 @@ pipeline {
stage('px4_fmu-v4_default') { stage('px4_fmu-v4_default') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }

42
Jenkinsfile vendored
View File

@ -75,7 +75,7 @@ pipeline {
stage('Style check') { stage('Style check') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh 'make check_format' sh 'make check_format'
@ -90,7 +90,7 @@ pipeline {
stage('Bloaty px4_fmu-v2') { stage('Bloaty px4_fmu-v2') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -118,7 +118,7 @@ pipeline {
stage('Bloaty px4_fmu-v5') { stage('Bloaty px4_fmu-v5') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -146,7 +146,7 @@ pipeline {
stage('SITL unit tests') { stage('SITL unit tests') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -168,7 +168,7 @@ pipeline {
stage('Clang analyzer') { stage('Clang analyzer') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -205,7 +205,7 @@ pipeline {
// stage('Clang tidy') { // stage('Clang tidy') {
// agent { // agent {
// docker { // 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' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// } // }
// } // }
@ -226,7 +226,7 @@ pipeline {
stage('Cppcheck') { stage('Cppcheck') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -263,7 +263,7 @@ pipeline {
stage('Check stack') { stage('Check stack') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -282,7 +282,7 @@ pipeline {
stage('ShellCheck') { stage('ShellCheck') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -301,7 +301,7 @@ pipeline {
stage('Module config validation') { stage('Module config validation') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -326,7 +326,7 @@ pipeline {
stage('Airframe') { stage('Airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -345,7 +345,7 @@ pipeline {
stage('Parameter') { stage('Parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -364,7 +364,7 @@ pipeline {
stage('Module') { stage('Module') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@ -384,7 +384,7 @@ pipeline {
stage('uORB graphs') { stage('uORB graphs') {
agent { agent {
docker { 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' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@ -413,7 +413,7 @@ pipeline {
stage('Devguide') { stage('Devguide') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh('export') sh('export')
@ -443,7 +443,7 @@ pipeline {
stage('Userguide') { stage('Userguide') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh('export') sh('export')
@ -471,7 +471,7 @@ pipeline {
stage('QGroundControl') { stage('QGroundControl') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh('export') sh('export')
@ -499,7 +499,7 @@ pipeline {
stage('PX4 ROS msgs') { stage('PX4 ROS msgs') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-27' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh('export') sh('export')
@ -522,7 +522,7 @@ pipeline {
stage('PX4 ROS2 bridge') { stage('PX4 ROS2 bridge') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-27' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh('export') sh('export')
@ -553,7 +553,7 @@ pipeline {
stage('S3') { stage('S3') {
agent { agent {
docker { image 'px4io/px4-dev-base:2019-01-26' } docker { image 'px4io/px4-dev-base:2019-02-09' }
} }
steps { steps {
sh('export') sh('export')
@ -590,7 +590,7 @@ pipeline {
GIT_COMMITTER_NAME = "PX4BuildBot" GIT_COMMITTER_NAME = "PX4BuildBot"
} }
options { options {
buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '30')) buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30'))
timeout(time: 60, unit: 'MINUTES') timeout(time: 60, unit: 'MINUTES')
} }
} }

12
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:2019-01-27" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # 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 elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
elif [[ $@ =~ .*ocpoc.* ]]; then elif [[ $@ =~ .*ocpoc.* ]]; then
# aerotennaocpoc_ubuntu # 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 elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # 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 elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation # 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 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:2019-01-27" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09"
fi fi
# docker hygiene # docker hygiene