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

update px4 dev containers to 2019-02-09 

- this updates all containers except for px4-dev-snapdragon
sbg
Daniel Agar 6 years ago 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
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. 8
      .ci/Jenkinsfile-SITL_tests_coverage
  3. 12
      .ci/Jenkinsfile-compile
  4. 2
      .ci/Jenkinsfile-hardware
  5. 42
      Jenkinsfile
  6. 12
      Tools/docker_run.sh

8
.ci/Jenkinsfile-SITL_tests
Unescape View File

@ -8,8 +8,8 @@ pipeline { @@ -8,8 +8,8 @@ pipeline {
stage('Build') {
agent {
docker {
image 'px4io/px4-dev-ros-kinetic:2018-09-11'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE --cap-add SYS_PTRACE --entrypoint=""'
image 'px4io/px4-dev-ros-kinetic:2019-02-09'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
steps {
@ -100,7 +100,7 @@ pipeline { @@ -100,7 +100,7 @@ pipeline {
}
options {
buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '14'))
timeout(time: 60, unit: 'MINUTES')
}
} // pipeline
@ -109,7 +109,7 @@ def createTestNode(Map test_def) { @@ -109,7 +109,7 @@ def createTestNode(Map test_def) {
return {
node {
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) {
def test_ok = true
sh('export')

8
.ci/Jenkinsfile-SITL_tests_coverage
Unescape View File

@ -72,7 +72,7 @@ pipeline { @@ -72,7 +72,7 @@ pipeline {
stage('code coverage (python)') {
agent {
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'
}
}
@ -91,7 +91,7 @@ pipeline { @@ -91,7 +91,7 @@ pipeline {
stage('unit tests') {
agent {
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'
}
}
@ -119,7 +119,7 @@ pipeline { @@ -119,7 +119,7 @@ pipeline {
}
options {
buildDiscarder(logRotator(numToKeepStr: '2', artifactDaysToKeepStr: '14'))
buildDiscarder(logRotator(numToKeepStr: '5', artifactDaysToKeepStr: '14'))
timeout(time: 60, unit: 'MINUTES')
}
} // pipeline
@ -128,7 +128,7 @@ def createTestNode(Map test_def) { @@ -128,7 +128,7 @@ def createTestNode(Map test_def) {
return {
node {
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) {
def test_ok = true
sh('export')

12
.ci/Jenkinsfile-compile
Unescape View File

@ -9,11 +9,11 @@ pipeline { @@ -9,11 +9,11 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
armhf: "px4io/px4-dev-armhf:2019-01-27",
base: "px4io/px4-dev-base:2019-01-26",
nuttx: "px4io/px4-dev-nuttx:2019-01-27",
ros: "px4io/px4-dev-ros:2019-01-27",
rpi: "px4io/px4-dev-raspi:2019-01-27",
armhf: "px4io/px4-dev-armhf:2019-02-09",
base: "px4io/px4-dev-base:2019-02-09",
nuttx: "px4io/px4-dev-nuttx:2019-02-09",
ros: "px4io/px4-dev-ros-kinetic:2019-02-09",
rpi: "px4io/px4-dev-raspi:2019-02-09",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]
@ -81,7 +81,7 @@ pipeline { @@ -81,7 +81,7 @@ pipeline {
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
docker { image 'px4io/px4-dev-base:2019-01-26' }
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
options {
skipDefaultCheckout()

2
.ci/Jenkinsfile-hardware
Unescape View File

@ -9,7 +9,7 @@ pipeline { @@ -9,7 +9,7 @@ pipeline {
stage('px4_fmu-v4_default') {
agent {
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'
}
}

42
Jenkinsfile vendored
Unescape View File

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

12
Tools/docker_run.sh
Unescape View File

@ -4,22 +4,22 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then @@ -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:2019-01-27"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-02-09"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# 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
# eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
elif [[ $@ =~ .*ocpoc.* ]]; then
# 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
# 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
# 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
else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@ -27,7 +27,7 @@ fi @@ -27,7 +27,7 @@ fi
# otherwise default to nuttx
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
# docker hygiene

Write Preview
Loading…
Cancel
Save