fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 06:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Jenkins update docker containers to 2018-09-11 (#10463)

Browse Source
This commit is contained in:
Daniel Agar
2018-09-12 00:05:22 -04:00
committed by GitHub
parent c41d7ebdd3
commit 90b60d44dc
5 changed files with 36 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/Jenkinsfile-SITL_tests
+4 -4
View File
@@ -16,7 +16,7 @@ pipeline {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2018-08-23' image 'px4io/px4-dev-ros-kinetic:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -145,7 +145,7 @@ pipeline {
stage('code coverage (python)') { stage('code coverage (python)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base:2018-08-23' image 'px4io/px4-dev-base:2018-09-11'
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('unit tests') { stage('unit tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base:2018-08-23' image 'px4io/px4-dev-base:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -204,7 +204,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros:2018-08-23").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-kinetic:2018-09-11").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
try { try {
.ci/Jenkinsfile-compile
+8 -33
View File
@@ -9,13 +9,13 @@ pipeline {
script { script {
def build_nodes = [:] def build_nodes = [:]
def docker_images = [ def docker_images = [
arch: "px4io/px4-dev-base-archlinux:2018-07-19", arch: "px4io/px4-dev-base-archlinux:2018-09-11",
armhf: "px4io/px4-dev-armhf:2018-07-19", armhf: "px4io/px4-dev-armhf:2018-09-11",
base: "px4io/px4-dev-base:2018-07-19", base: "px4io/px4-dev-base:2018-09-11",
clang: "px4io/px4-dev-clang:2018-07-19", clang: "px4io/px4-dev-clang:2018-09-11",
nuttx: "px4io/px4-dev-nuttx:2018-07-19", nuttx: "px4io/px4-dev-nuttx:2018-09-11",
ros: "px4io/px4-dev-ros:2018-07-19", ros: "px4io/px4-dev-ros:2018-09-11",
rpi: "px4io/px4-dev-raspi:2018-07-19", rpi: "px4io/px4-dev-raspi:2018-09-11",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2017-12-29" snapdragon: "lorenzmeier/px4-dev-snapdragon:2017-12-29"
] ]
@@ -67,31 +67,6 @@ pipeline {
} }
} }
// Ubuntu 18.04 test posix_sitl_default
build_nodes["posix_sitl_default (Ubuntu 18.04)"] = {
node {
docker.image('px4io/px4-dev-base:2018-08-21').inside('-e CCACHE_BASEDIR=${WORKSPACE} -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("sitl (Ubuntu 18.04)") {
try {
sh('export')
checkout(scm)
sh('make distclean')
sh('git fetch --tags')
sh('ccache -z')
sh('make posix_sitl_default')
sh('ccache -s')
}
catch (exc) {
throw (exc)
}
finally {
sh('make distclean')
}
}
}
}
}
// docker builds: // docker builds:
def arch_builds = [ def arch_builds = [
target: ["posix_sitl_default"], target: ["posix_sitl_default"],
@@ -159,7 +134,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:2018-07-19' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
options { options {
skipDefaultCheckout() skipDefaultCheckout()
.ci/Jenkinsfile-hardware
+2 -2
View File
@@ -9,7 +9,7 @@ pipeline {
stage('px4fmu-v2') { stage('px4fmu-v2') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-08-05' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -34,7 +34,7 @@ pipeline {
stage('px4fmu-v4 (stackcheck)') { stage('px4fmu-v4 (stackcheck)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-08-05' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
Jenkinsfile
Vendored
+15 -15
View File
@@ -8,7 +8,7 @@ pipeline {
stage('Style Check') { stage('Style Check') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-07-19' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
@@ -19,7 +19,7 @@ pipeline {
stage('bloaty px4fmu-v2') { stage('bloaty px4fmu-v2') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-07-19' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -43,7 +43,7 @@ pipeline {
stage('bloaty px4fmu-v5') { stage('bloaty px4fmu-v5') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-07-19' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -67,7 +67,7 @@ pipeline {
stage('clang analyzer') { stage('clang analyzer') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2018-07-19' image 'px4io/px4-dev-clang:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -115,7 +115,7 @@ pipeline {
stage('cppcheck') { stage('cppcheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base:2018-08-23' image 'px4io/px4-dev-base:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -148,7 +148,7 @@ pipeline {
stage('check stack') { stage('check stack') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-07-19' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -163,7 +163,7 @@ pipeline {
stage('ShellCheck') { stage('ShellCheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-08-23' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -184,7 +184,7 @@ pipeline {
stage('airframe') { stage('airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-07-19' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -199,7 +199,7 @@ pipeline {
stage('parameter') { stage('parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-07-19' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -214,7 +214,7 @@ pipeline {
stage('module') { stage('module') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-07-19' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -230,7 +230,7 @@ pipeline {
stage('uorb graphs') { stage('uorb graphs') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2018-07-19' image 'px4io/px4-dev-nuttx:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -255,7 +255,7 @@ pipeline {
stage('Devguide') { stage('Devguide') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-08-05' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh('export') sh('export')
@@ -284,7 +284,7 @@ pipeline {
stage('Userguide') { stage('Userguide') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-08-05' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh('export') sh('export')
@@ -311,7 +311,7 @@ pipeline {
stage('QGroundControl') { stage('QGroundControl') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-08-05' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh('export') sh('export')
@@ -338,7 +338,7 @@ pipeline {
stage('S3') { stage('S3') {
agent { agent {
docker { image 'px4io/px4-dev-base:2018-08-05' } docker { image 'px4io/px4-dev-base:2018-09-11' }
} }
steps { steps {
sh('export') sh('export')
Tools/docker_run.sh
+7 -7
View File
@@ -4,25 +4,25 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input"; echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then if [[ $@ =~ .*px4fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-07-19" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-09-11"
elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-07-19" PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-09-11"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29"
elif [[ $@ =~ .*ocpoc.* ]]; then elif [[ $@ =~ .*ocpoc.* ]]; then
# posix_ocpoc_ubuntu # posix_ocpoc_ubuntu
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2018-07-19" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2018-09-11"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-07-19" PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-09-11"
elif [[ $@ =~ .*cppcheck.* ]]; then elif [[ $@ =~ .*cppcheck.* ]]; then
# TODO: remove this once px4io/px4-dev-base updates # TODO: remove this once px4io/px4-dev-base updates
PX4_DOCKER_REPO="px4io/px4-dev-base:ubuntu17.10" PX4_DOCKER_REPO="px4io/px4-dev-base:2018-09-11"
elif [[ $@ =~ .*tests* ]]; then elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation # run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-07-19" PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-09-11"
fi fi
else else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -30,7 +30,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:2018-07-19" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-09-11"
fi fi
# docker hygiene # docker hygiene