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

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

View File

@@ -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 {
}
}
// 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 {
// 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()