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

jenkins: update all image tags to 2019-03-08

sbg
Anthony Lamping 6 years ago committed by Daniel Agar
parent
cb49ed55fe
commit
84c52439e9
7 changed files with 67 additions and 65 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. 4
      .ci/Jenkinsfile-SITL_tests
  2. 4
      .ci/Jenkinsfile-SITL_tests_ASan
  3. 6
      .ci/Jenkinsfile-SITL_tests_coverage
  4. 48
      .ci/Jenkinsfile-compile
  5. 12
      .ci/Jenkinsfile-hardware
  6. 46
      Jenkinsfile
  7. 12
      Tools/docker_run.sh

4
.ci/Jenkinsfile-SITL_tests
Unescape View File

@ -8,7 +8,7 @@ pipeline { @@ -8,7 +8,7 @@ pipeline {
stage('Build') {
agent {
docker {
image 'px4io/px4-dev-ros-kinetic:2019-02-14'
image 'px4io/px4-dev-ros-kinetic:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
@ -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:2019-02-14").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def test_ok = true
sh('export')

4
.ci/Jenkinsfile-SITL_tests_ASan
Unescape View File

@ -8,7 +8,7 @@ pipeline { @@ -8,7 +8,7 @@ pipeline {
stage('Build') {
agent {
docker {
image 'px4io/px4-dev-ros-kinetic:2019-02-14'
image 'px4io/px4-dev-ros-kinetic:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
@ -110,7 +110,7 @@ def createTestNode(Map test_def) { @@ -110,7 +110,7 @@ def createTestNode(Map test_def) {
return {
node {
cleanWs()
docker.image("px4io/px4-dev-ros-kinetic:2019-02-14").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def test_ok = true
sh('export')

6
.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-09'
image 'px4io/px4-dev-base:2019-03-08'
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-09'
image 'px4io/px4-dev-base:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -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:2019-02-14").inside('-e HOME=${WORKSPACE}') {
docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) {
def test_ok = true
sh('export')

48
.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-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-14",
rpi: "px4io/px4-dev-raspi:2019-02-09",
armhf: "px4io/px4-dev-armhf:2019-03-08",
base: "px4io/px4-dev-base-bionic:2019-03-08",
nuttx: "px4io/px4-dev-nuttx:2019-03-08",
ros: "px4io/px4-dev-ros-kinetic:2019-03-08",
rpi: "px4io/px4-dev-raspi:2019-03-08",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]
@ -79,25 +79,25 @@ pipeline { @@ -79,25 +79,25 @@ pipeline {
} // stage Build
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
}
options {
skipDefaultCheckout()
}
when {
anyOf {
branch 'master'
branch 'beta'
branch 'stable'
branch 'pr-jenkins' // for testing
}
}
steps {
sh 'echo "uploading to S3"'
}
}
// stage('S3 Upload') {
// agent {
// docker { image 'px4io/px4-dev-base:2019-03-08' }
// }
// options {
// skipDefaultCheckout()
// }
// when {
// anyOf {
// branch 'master'
// branch 'beta'
// branch 'stable'
// branch 'pr-jenkins' // for testing
// }
// }
// steps {
// sh 'echo "uploading to S3"'
// }
// }
} // stages
environment {

12
.ci/Jenkinsfile-hardware
Unescape View File

@ -11,7 +11,7 @@ pipeline { @@ -11,7 +11,7 @@ pipeline {
stage('px4_fmu-v2_test') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -35,7 +35,7 @@ pipeline { @@ -35,7 +35,7 @@ pipeline {
stage('px4_fmu-v3_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -59,7 +59,7 @@ pipeline { @@ -59,7 +59,7 @@ pipeline {
stage('px4_fmu-v4_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -83,7 +83,7 @@ pipeline { @@ -83,7 +83,7 @@ pipeline {
stage('px4_fmu-v4pro_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -107,7 +107,7 @@ pipeline { @@ -107,7 +107,7 @@ pipeline {
stage('px4_fmu-v5_default') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -131,7 +131,7 @@ pipeline { @@ -131,7 +131,7 @@ pipeline {
stage('px4_fmu-v5_stackcheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}

46
Jenkinsfile vendored
Unescape View File

@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
#!/usr/bin/env groovy
pipeline {
agent none
stages {
@ -9,7 +11,7 @@ pipeline { @@ -9,7 +11,7 @@ pipeline {
// stage('Catkin build on ROS workspace') {
// agent {
// docker {
// image 'px4io/px4-dev-ros:2019-02-09'
// image 'px4io/px4-dev-ros:2019-03-08'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
// }
// }
@ -45,7 +47,7 @@ pipeline { @@ -45,7 +47,7 @@ pipeline {
// stage('Colcon build on ROS2 workspace') {
// agent {
// docker {
// image 'px4io/px4-dev-ros2-bouncy:2019-02-09'
// image 'px4io/px4-dev-ros2-bouncy:2019-03-08'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
// }
// }
@ -75,7 +77,7 @@ pipeline { @@ -75,7 +77,7 @@ pipeline {
stage('Style check') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh 'make check_format'
@ -90,7 +92,7 @@ pipeline { @@ -90,7 +92,7 @@ pipeline {
stage('Bloaty px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -118,7 +120,7 @@ pipeline { @@ -118,7 +120,7 @@ pipeline {
stage('Bloaty px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -146,7 +148,7 @@ pipeline { @@ -146,7 +148,7 @@ pipeline {
stage('SITL unit tests') {
agent {
docker {
image 'px4io/px4-dev-base:2019-02-09'
image 'px4io/px4-dev-base-bionic:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -168,7 +170,7 @@ pipeline { @@ -168,7 +170,7 @@ pipeline {
stage('Clang analyzer') {
agent {
docker {
image 'px4io/px4-dev-clang:2019-02-09'
image 'px4io/px4-dev-clang:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -205,7 +207,7 @@ pipeline { @@ -205,7 +207,7 @@ pipeline {
// stage('Clang tidy') {
// agent {
// docker {
// image 'px4io/px4-dev-clang:2019-02-09'
// image 'px4io/px4-dev-clang:2019-03-08'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// }
// }
@ -226,7 +228,7 @@ pipeline { @@ -226,7 +228,7 @@ pipeline {
stage('Cppcheck') {
agent {
docker {
image 'px4io/px4-dev-base:2019-02-09'
image 'px4io/px4-dev-base-bionic:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -263,7 +265,7 @@ pipeline { @@ -263,7 +265,7 @@ pipeline {
stage('Check stack') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -282,7 +284,7 @@ pipeline { @@ -282,7 +284,7 @@ pipeline {
stage('ShellCheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -301,7 +303,7 @@ pipeline { @@ -301,7 +303,7 @@ pipeline {
stage('Module config validation') {
agent {
docker {
image 'px4io/px4-dev-base:2019-02-09'
image 'px4io/px4-dev-base-bionic:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -326,7 +328,7 @@ pipeline { @@ -326,7 +328,7 @@ pipeline {
stage('Airframe') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh 'make distclean'
@ -345,7 +347,7 @@ pipeline { @@ -345,7 +347,7 @@ pipeline {
stage('Parameter') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh 'make distclean'
@ -364,7 +366,7 @@ pipeline { @@ -364,7 +366,7 @@ pipeline {
stage('Module') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh 'make distclean'
@ -384,7 +386,7 @@ pipeline { @@ -384,7 +386,7 @@ pipeline {
stage('uORB graphs') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2019-02-09'
image 'px4io/px4-dev-nuttx:2019-03-08'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -413,7 +415,7 @@ pipeline { @@ -413,7 +415,7 @@ pipeline {
stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh('export')
@ -443,7 +445,7 @@ pipeline { @@ -443,7 +445,7 @@ pipeline {
stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh('export')
@ -471,7 +473,7 @@ pipeline { @@ -471,7 +473,7 @@ pipeline {
stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh('export')
@ -499,7 +501,7 @@ pipeline { @@ -499,7 +501,7 @@ pipeline {
stage('PX4 ROS msgs') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh('export')
@ -528,7 +530,7 @@ pipeline { @@ -528,7 +530,7 @@ pipeline {
stage('PX4 ROS2 bridge') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh('export')
@ -559,7 +561,7 @@ pipeline { @@ -559,7 +561,7 @@ pipeline {
stage('S3') {
agent {
docker { image 'px4io/px4-dev-base:2019-02-09' }
docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
}
steps {
sh('export')

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-02-09"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-03-08"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-02-09"
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-03-08"
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-02-09"
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-03-08"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-02-09"
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-03-08"
elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-02-09"
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2019-03-08"
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-02-09"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-03-08"
fi
# docker hygiene

Write Preview
Loading…
Cancel
Save