zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

sbg
Daniel Agar 7 years ago committed by GitHub
parent
c41d7ebdd3
commit
90b60d44dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      .ci/Jenkinsfile-SITL_tests
  2. 41
      .ci/Jenkinsfile-compile
  3. 4
      .ci/Jenkinsfile-hardware
  4. 30
      Jenkinsfile
  5. 14
      Tools/docker_run.sh

8
.ci/Jenkinsfile-SITL_tests
Unescape View File

@ -16,7 +16,7 @@ pipeline { @@ -16,7 +16,7 @@ pipeline {
agent {
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'
}
}
@ -145,7 +145,7 @@ pipeline { @@ -145,7 +145,7 @@ pipeline {
stage('code coverage (python)') {
agent {
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'
}
}
@ -168,7 +168,7 @@ pipeline { @@ -168,7 +168,7 @@ pipeline {
stage('unit tests') {
agent {
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'
}
}
@ -204,7 +204,7 @@ def createTestNode(Map test_def) { @@ -204,7 +204,7 @@ def createTestNode(Map test_def) {
return {
node {
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) {
try {

41
.ci/Jenkinsfile-compile
Unescape View File

@ -9,13 +9,13 @@ pipeline { @@ -9,13 +9,13 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
arch: "px4io/px4-dev-base-archlinux:2018-07-19",
armhf: "px4io/px4-dev-armhf:2018-07-19",
base: "px4io/px4-dev-base:2018-07-19",
clang: "px4io/px4-dev-clang:2018-07-19",
nuttx: "px4io/px4-dev-nuttx:2018-07-19",
ros: "px4io/px4-dev-ros:2018-07-19",
rpi: "px4io/px4-dev-raspi:2018-07-19",
arch: "px4io/px4-dev-base-archlinux:2018-09-11",
armhf: "px4io/px4-dev-armhf:2018-09-11",
base: "px4io/px4-dev-base:2018-09-11",
clang: "px4io/px4-dev-clang:2018-09-11",
nuttx: "px4io/px4-dev-nuttx:2018-09-11",
ros: "px4io/px4-dev-ros:2018-09-11",
rpi: "px4io/px4-dev-raspi:2018-09-11",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2017-12-29"
]
@ -67,31 +67,6 @@ pipeline { @@ -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:
def arch_builds = [
target: ["posix_sitl_default"],
@ -159,7 +134,7 @@ pipeline { @@ -159,7 +134,7 @@ pipeline {
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
docker { image 'px4io/px4-dev-base:2018-07-19' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
options {
skipDefaultCheckout()

4
.ci/Jenkinsfile-hardware
Unescape View File

@ -9,7 +9,7 @@ pipeline { @@ -9,7 +9,7 @@ pipeline {
stage('px4fmu-v2') {
agent {
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'
}
}
@ -34,7 +34,7 @@ pipeline { @@ -34,7 +34,7 @@ pipeline {
stage('px4fmu-v4 (stackcheck)') {
agent {
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'
}
}

30
Jenkinsfile vendored
Unescape View File

@ -8,7 +8,7 @@ pipeline { @@ -8,7 +8,7 @@ pipeline {
stage('Style Check') {
agent {
docker { image 'px4io/px4-dev-base:2018-07-19' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
@ -19,7 +19,7 @@ pipeline { @@ -19,7 +19,7 @@ pipeline {
stage('bloaty px4fmu-v2') {
agent {
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'
}
}
@ -43,7 +43,7 @@ pipeline { @@ -43,7 +43,7 @@ pipeline {
stage('bloaty px4fmu-v5') {
agent {
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'
}
}
@ -67,7 +67,7 @@ pipeline { @@ -67,7 +67,7 @@ pipeline {
stage('clang analyzer') {
agent {
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'
}
}
@ -115,7 +115,7 @@ pipeline { @@ -115,7 +115,7 @@ pipeline {
stage('cppcheck') {
agent {
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'
}
}
@ -148,7 +148,7 @@ pipeline { @@ -148,7 +148,7 @@ pipeline {
stage('check stack') {
agent {
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'
}
}
@ -163,7 +163,7 @@ pipeline { @@ -163,7 +163,7 @@ pipeline {
stage('ShellCheck') {
agent {
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'
}
}
@ -184,7 +184,7 @@ pipeline { @@ -184,7 +184,7 @@ pipeline {
stage('airframe') {
agent {
docker { image 'px4io/px4-dev-base:2018-07-19' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh 'make distclean'
@ -199,7 +199,7 @@ pipeline { @@ -199,7 +199,7 @@ pipeline {
stage('parameter') {
agent {
docker { image 'px4io/px4-dev-base:2018-07-19' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh 'make distclean'
@ -214,7 +214,7 @@ pipeline { @@ -214,7 +214,7 @@ pipeline {
stage('module') {
agent {
docker { image 'px4io/px4-dev-base:2018-07-19' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh 'make distclean'
@ -230,7 +230,7 @@ pipeline { @@ -230,7 +230,7 @@ pipeline {
stage('uorb graphs') {
agent {
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'
}
}
@ -255,7 +255,7 @@ pipeline { @@ -255,7 +255,7 @@ pipeline {
stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base:2018-08-05' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh('export')
@ -284,7 +284,7 @@ pipeline { @@ -284,7 +284,7 @@ pipeline {
stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base:2018-08-05' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh('export')
@ -311,7 +311,7 @@ pipeline { @@ -311,7 +311,7 @@ pipeline {
stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base:2018-08-05' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh('export')
@ -338,7 +338,7 @@ pipeline { @@ -338,7 +338,7 @@ pipeline {
stage('S3') {
agent {
docker { image 'px4io/px4-dev-base:2018-08-05' }
docker { image 'px4io/px4-dev-base:2018-09-11' }
}
steps {
sh('export')

14
Tools/docker_run.sh
Unescape View File

@ -4,25 +4,25 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then @@ -4,25 +4,25 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then
# 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
# 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
# eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29"
elif [[ $@ =~ .*ocpoc.* ]]; then
# 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
# 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
# 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
# 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
else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@ -30,7 +30,7 @@ fi @@ -30,7 +30,7 @@ fi
# otherwise default to nuttx
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
# docker hygiene

Write Preview
Loading…
Cancel
Save