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

update all docker containers to latest 2019-01-27 

- Jenkins compile drop arch until container is updated and maintained
 - clang-tidy disable for now, the new version isn't respecting the existing configuration
This commit is contained in:
Daniel Agar 2019-01-28 13:08:58 -05:00 committed by GitHub
parent c2e48f45ab
commit 0f386ee52a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.ci/Jenkinsfile-compile
View File

@ -9,12 +9,11 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
arch: "px4io/px4-dev-base-archlinux:2019-01-01",
armhf: "px4io/px4-dev-armhf:2019-01-01",
armhf: "px4io/px4-dev-armhf:2019-01-27",
base: "px4io/px4-dev-base:2019-01-26",
nuttx: "px4io/px4-dev-nuttx:2019-01-01",
ros: "px4io/px4-dev-ros:2019-01-01",
rpi: "px4io/px4-dev-raspi:2019-01-01",
nuttx: "px4io/px4-dev-nuttx:2019-01-27",
ros: "px4io/px4-dev-ros:2019-01-27",
rpi: "px4io/px4-dev-raspi:2019-01-27",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]
@ -67,13 +66,6 @@ pipeline {
}
}
// docker builds:
def arch_builds = [
target: ["px4_sitl_default"],
image: docker_images.arch,
archive: false
]
def armhf_builds = [
target: ["aerotenna_ocpoc_ubuntu"],
image: docker_images.armhf,
@ -113,7 +105,7 @@ pipeline {
]
def docker_builds = [
arch_builds, armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, rpi_builds, snapdragon_builds
armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, rpi_builds, snapdragon_builds
]
for (def build_type = 0; build_type < docker_builds.size(); build_type++) {

4
.ci/Jenkinsfile-hardware
View File

@ -9,7 +9,7 @@ pipeline {
stage('px4_fmu-v4_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -34,7 +34,7 @@ pipeline {
stage('px4_fmu-v4_stackcheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}

58
Jenkinsfile vendored
View File

@ -9,7 +9,7 @@ pipeline {
stage('Catkin build on ROS workspace') {
agent {
docker {
image 'px4io/px4-dev-ros:2019-01-01'
image 'px4io/px4-dev-ros:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
@ -44,7 +44,7 @@ pipeline {
stage('Colcon build on ROS2 workspace') {
agent {
docker {
image 'px4io/px4-dev-ros2-bouncy:2019-01-01'
image 'px4io/px4-dev-ros2-bouncy:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
@ -88,7 +88,7 @@ pipeline {
stage('Bloaty px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -116,7 +116,7 @@ pipeline {
stage('Bloaty px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -144,7 +144,7 @@ pipeline {
stage('Clang analyzer') {
agent {
docker {
image 'px4io/px4-dev-clang:2019-01-01'
image 'px4io/px4-dev-clang:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -178,26 +178,26 @@ pipeline {
}
}
stage('Clang tidy') {
agent {
docker {
image 'px4io/px4-dev-clang:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
retry (3) {
sh 'make distclean'
sh 'make clang-tidy-quiet'
}
}
post {
always {
sh 'make distclean'
}
}
}
// stage('Clang tidy') {
// agent {
// docker {
// image 'px4io/px4-dev-clang:2019-01-27'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// }
// }
// steps {
// sh 'export'
// retry (3) {
// sh 'make distclean'
// sh 'make clang-tidy-quiet'
// }
// }
// post {
// always {
// sh 'make distclean'
// }
// }
// }
stage('Cppcheck') {
agent {
@ -239,7 +239,7 @@ pipeline {
stage('Check stack') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -258,7 +258,7 @@ pipeline {
stage('ShellCheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -360,7 +360,7 @@ pipeline {
stage('uORB graphs') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-01-01'
image 'px4io/px4-dev-nuttx:2019-01-27'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -475,7 +475,7 @@ pipeline {
stage('PX4 ROS msgs') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-01' }
docker { image 'px4io/px4-dev-base:2019-01-27' }
}
steps {
checkout(scm)

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";
if [[ $@ =~ .*px4_fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-11-22"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-01-27"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-11-22"
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-01-27"
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:2018-11-22"
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-01-27"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-11-22"
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-01-27"
elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-11-22"
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-01-27"
fi
else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@ -27,7 +27,7 @@ fi
# otherwise default to nuttx
if [ -z ${PX4_DOCKER_REPO+x} ]; then
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-11-22"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-01-27"
fi
# docker hygiene