Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

docker images update to 2018-03-30 tag

Browse Source
This commit is contained in:
Daniel Agar
2018-03-30 14:01:29 -04:00
parent e6eab2e306
commit 04ecc81a70
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+24 -24
View File
@@ -4,7 +4,7 @@ pipeline {
stage('Style Check') { stage('Style Check') {
agent { agent {
docker { image 'px4io/px4-dev-base:2017-12-30' } docker { image 'px4io/px4-dev-base:2018-03-30' }
} }
steps { steps {
@@ -26,7 +26,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -56,7 +56,7 @@ pipeline {
builds["px4fmu-v2"] = { builds["px4fmu-v2"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -91,7 +91,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -118,7 +118,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-nuttx:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-nuttx:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -142,7 +142,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-base:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-base:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -165,7 +165,7 @@ pipeline {
builds["${node_name}"] = { builds["${node_name}"] = {
node { node {
stage("Build Test ${node_name}") { stage("Build Test ${node_name}") {
docker.image('px4io/px4-dev-raspi:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-raspi:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -236,7 +236,7 @@ pipeline {
builds["${node_name} (GCC7)"] = { builds["${node_name} (GCC7)"] = {
node { node {
stage("Build Test ${node_name} (GCC7)") { stage("Build Test ${node_name} (GCC7)") {
docker.image('px4io/px4-dev-base-archlinux:2017-12-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') { docker.image('px4io/px4-dev-base-archlinux:2018-03-30').inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
stage("${node_name}") { stage("${node_name}") {
checkout scm checkout scm
sh "export" sh "export"
@@ -262,7 +262,7 @@ pipeline {
stage('clang analyzer') { stage('clang analyzer') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2017-12-30' image 'px4io/px4-dev-clang:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -293,7 +293,7 @@ pipeline {
stage('clang tidy') { stage('clang tidy') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2017-12-30' image 'px4io/px4-dev-clang:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -338,7 +338,7 @@ pipeline {
stage('tests') { stage('tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base:2017-12-30' image 'px4io/px4-dev-base:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -353,7 +353,7 @@ pipeline {
stage('ROS vtol mission new 1') { stage('ROS vtol mission new 1') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -380,7 +380,7 @@ pipeline {
stage('ROS vtol mission new 2') { stage('ROS vtol mission new 2') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -407,7 +407,7 @@ pipeline {
stage('ROS vtol mission old 1') { stage('ROS vtol mission old 1') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -434,7 +434,7 @@ pipeline {
stage('ROS vtol mission old 2') { stage('ROS vtol mission old 2') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -461,7 +461,7 @@ pipeline {
stage('ROS vtol mission old 3') { stage('ROS vtol mission old 3') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -488,7 +488,7 @@ pipeline {
stage('ROS MC mission box') { stage('ROS MC mission box') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -515,7 +515,7 @@ pipeline {
stage('ROS offboard att') { stage('ROS offboard att') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -542,7 +542,7 @@ pipeline {
stage('ROS offboard pos') { stage('ROS offboard pos') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros:2017-12-31' image 'px4io/px4-dev-ros:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -575,7 +575,7 @@ pipeline {
stage('airframe') { stage('airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base:2017-12-30' } docker { image 'px4io/px4-dev-base:2018-03-30' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -586,7 +586,7 @@ pipeline {
stage('parameter') { stage('parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base:2017-12-30' } docker { image 'px4io/px4-dev-base:2018-03-30' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -597,7 +597,7 @@ pipeline {
stage('module') { stage('module') {
agent { agent {
docker { image 'px4io/px4-dev-base:2017-12-30' } docker { image 'px4io/px4-dev-base:2018-03-30' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -609,7 +609,7 @@ pipeline {
stage('uorb graphs') { stage('uorb graphs') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2017-12-30' image 'px4io/px4-dev-nuttx:2018-03-30'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -625,7 +625,7 @@ pipeline {
stage('S3 Upload') { stage('S3 Upload') {
agent { agent {
docker { image 'px4io/px4-dev-base:2017-12-30' } docker { image 'px4io/px4-dev-base:2018-03-30' }
} }
when { when {
Tools/docker_run.sh
+5 -5
View File
@@ -4,10 +4,10 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input"; echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then if [[ $@ =~ .*px4fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-03-30"
elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-raspi:2018-03-30"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2017-12-29"
@@ -16,13 +16,13 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2017-12-30"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-clang:2018-03-30"
elif [[ $@ =~ .*cppcheck.* ]]; then elif [[ $@ =~ .*cppcheck.* ]]; then
# TODO: remove this once px4io/px4-dev-base updates # 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:ubuntu17.10"
elif [[ $@ =~ .*tests* ]]; then elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation # run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-simulation:2018-03-30"
fi fi
else else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -30,7 +30,7 @@ fi
# otherwise default to nuttx # otherwise default to nuttx
if [ -z ${PX4_DOCKER_REPO+x} ]; then if [ -z ${PX4_DOCKER_REPO+x} ]; then
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-12-30" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-03-30"
fi fi
# docker hygiene # docker hygiene