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

update docker images to 2018-11-22 tag 

- keeping nuttx and armhf compile jobs on 2018-09-11 for now
sbg
Daniel Agar 6 years ago
parent
d42edfc612
commit
2c33a937dd
5 changed files with 32 additions and 33 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. 9
      .ci/Jenkinsfile-compile
  3. 4
      .ci/Jenkinsfile-hardware
  4. 34
      Jenkinsfile
  5. 14
      Tools/docker_run.sh

4
.ci/Jenkinsfile-SITL_tests
Unescape View File

@ -146,7 +146,7 @@ pipeline { @@ -146,7 +146,7 @@ pipeline {
stage('code coverage (python)') {
agent {
docker {
image 'px4io/px4-dev-base:2018-09-11'
image 'px4io/px4-dev-base:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE'
}
}
@ -169,7 +169,7 @@ pipeline { @@ -169,7 +169,7 @@ pipeline {
stage('unit tests') {
agent {
docker {
image 'px4io/px4-dev-base:2018-09-11'
image 'px4io/px4-dev-base:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw --cap-add SYS_PTRACE'
}
}

9
.ci/Jenkinsfile-compile
Unescape View File

@ -9,12 +9,11 @@ pipeline { @@ -9,12 +9,11 @@ pipeline {
script {
def build_nodes = [:]
def docker_images = [
arch: "px4io/px4-dev-base-archlinux:2018-09-11",
arch: "px4io/px4-dev-base-archlinux:2018-11-22",
armhf: "px4io/px4-dev-armhf:2018-09-11",
base: "px4io/px4-dev-base:2018-09-11",
clang: "px4io/px4-dev-clang:2018-09-11",
base: "px4io/px4-dev-base:2018-11-22",
nuttx: "px4io/px4-dev-nuttx:2018-09-11",
ros: "px4io/px4-dev-ros:2018-09-11",
ros: "px4io/px4-dev-ros:2018-11-22",
rpi: "px4io/px4-dev-raspi:2018-09-11",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]
@ -135,7 +134,7 @@ pipeline { @@ -135,7 +134,7 @@ pipeline {
// TODO: actually upload artifacts to S3
stage('S3 Upload') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
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-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
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-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}

34
Jenkinsfile vendored
Unescape View File

@ -9,7 +9,7 @@ pipeline { @@ -9,7 +9,7 @@ pipeline {
stage('Catkin') {
agent {
docker {
image 'px4io/px4-dev-ros:2018-09-24'
image 'px4io/px4-dev-ros:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
}
}
@ -38,7 +38,7 @@ pipeline { @@ -38,7 +38,7 @@ pipeline {
stage('Style check') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh 'make check_format'
@ -53,7 +53,7 @@ pipeline { @@ -53,7 +53,7 @@ pipeline {
stage('Bloaty px4fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -81,7 +81,7 @@ pipeline { @@ -81,7 +81,7 @@ pipeline {
stage('Bloaty px4fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -109,7 +109,7 @@ pipeline { @@ -109,7 +109,7 @@ pipeline {
stage('Clang analyzer') {
agent {
docker {
image 'px4io/px4-dev-clang:2018-09-11'
image 'px4io/px4-dev-clang:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -167,7 +167,7 @@ pipeline { @@ -167,7 +167,7 @@ pipeline {
stage('Cppcheck') {
agent {
docker {
image 'px4io/px4-dev-base:2018-09-11'
image 'px4io/px4-dev-base:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -204,7 +204,7 @@ pipeline { @@ -204,7 +204,7 @@ pipeline {
stage('Check stack') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -223,7 +223,7 @@ pipeline { @@ -223,7 +223,7 @@ pipeline {
stage('ShellCheck') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -242,7 +242,7 @@ pipeline { @@ -242,7 +242,7 @@ pipeline {
stage('Module config validation') {
agent {
docker {
image 'px4io/px4-dev-base:2018-09-11'
image 'px4io/px4-dev-base:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -267,7 +267,7 @@ pipeline { @@ -267,7 +267,7 @@ pipeline {
stage('Airframe') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh 'make distclean'
@ -286,7 +286,7 @@ pipeline { @@ -286,7 +286,7 @@ pipeline {
stage('Parameter') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh 'make distclean'
@ -305,7 +305,7 @@ pipeline { @@ -305,7 +305,7 @@ pipeline {
stage('Module') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh 'make distclean'
@ -325,7 +325,7 @@ pipeline { @@ -325,7 +325,7 @@ pipeline {
stage('uORB graphs') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-09-11'
image 'px4io/px4-dev-nuttx:2018-11-22'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
@ -354,7 +354,7 @@ pipeline { @@ -354,7 +354,7 @@ pipeline {
stage('Devguide') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh('export')
@ -383,7 +383,7 @@ pipeline { @@ -383,7 +383,7 @@ pipeline {
stage('Userguide') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh('export')
@ -410,7 +410,7 @@ pipeline { @@ -410,7 +410,7 @@ pipeline {
stage('QGroundControl') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
steps {
sh('export')
@ -437,7 +437,7 @@ pipeline { @@ -437,7 +437,7 @@ pipeline {
stage('S3') {
agent {
docker { image 'px4io/px4-dev-base:2018-09-11' }
docker { image 'px4io/px4-dev-base:2018-11-22' }
}
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-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-11-22"
elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-11-22"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
elif [[ $@ =~ .*ocpoc.* ]]; then
# posix_ocpoc_ubuntu
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2018-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2018-11-22"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-11-22"
elif [[ $@ =~ .*cppcheck.* ]]; then
# TODO: remove this once px4io/px4-dev-base updates
PX4_DOCKER_REPO="px4io/px4-dev-base:2018-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-base:2018-11-22"
elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-11-22"
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-09-11"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-11-22"
fi
# docker hygiene

Write Preview
Loading…
Cancel
Save