From 18f85ea520b9c9e9452dc986ca05841e2f08a29a Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Fri, 10 Jan 2020 14:21:25 +0100 Subject: [PATCH] Jenkins: bump docker tags --- .ci/Jenkinsfile-SITL_tests | 4 +-- .ci/Jenkinsfile-SITL_tests_ASan | 4 +-- .ci/Jenkinsfile-SITL_tests_coverage | 6 ++-- .ci/Jenkinsfile-compile | 8 ++--- .ci/Jenkinsfile-hardware | 18 +++++----- Jenkinsfile | 52 ++++++++++++++--------------- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 8baa0608be..13886b3e12 100644 --- a/.ci/Jenkinsfile-SITL_tests +++ b/.ci/Jenkinsfile-SITL_tests @@ -8,7 +8,7 @@ pipeline { stage('Build') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2019-12-18' + image 'px4io/px4-dev-ros-melodic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -130,7 +130,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2019-12-18").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-01-10").inside('-e HOME=${WORKSPACE}') { stage(test_def.name) { def run_script = test_def.get('run_script', 'rostest_px4_run.sh') def test_ok = true diff --git a/.ci/Jenkinsfile-SITL_tests_ASan b/.ci/Jenkinsfile-SITL_tests_ASan index 748167da93..34b7dfae16 100644 --- a/.ci/Jenkinsfile-SITL_tests_ASan +++ b/.ci/Jenkinsfile-SITL_tests_ASan @@ -8,7 +8,7 @@ pipeline { stage('Build') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2019-12-18' + image 'px4io/px4-dev-ros-melodic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -131,7 +131,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2019-12-18").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-01-10").inside('-e HOME=${WORKSPACE}') { stage(test_def.name) { def run_script = test_def.get('run_script', 'rostest_px4_run.sh') def test_ok = true diff --git a/.ci/Jenkinsfile-SITL_tests_coverage b/.ci/Jenkinsfile-SITL_tests_coverage index 9bfafaa172..224bf619bc 100644 --- a/.ci/Jenkinsfile-SITL_tests_coverage +++ b/.ci/Jenkinsfile-SITL_tests_coverage @@ -79,7 +79,7 @@ pipeline { stage('code coverage (python)') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-12-18' + image 'px4io/px4-dev-base-bionic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -99,7 +99,7 @@ pipeline { stage('unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-12-18' + image 'px4io/px4-dev-base-bionic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -137,7 +137,7 @@ def createTestNode(Map test_def) { return { node { cleanWs() - docker.image("px4io/px4-dev-ros-melodic:2019-12-18").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-01-10").inside('-e HOME=${WORKSPACE}') { stage(test_def.name) { def test_ok = true sh('export') diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index 7aaaae1575..4fff9d80ab 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,9 +9,9 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - armhf: "px4io/px4-dev-armhf:2019-12-18", - base: "px4io/px4-dev-base-bionic:2019-12-18", - nuttx: "px4io/px4-dev-nuttx:2019-12-18", + armhf: "px4io/px4-dev-armhf:2020-01-10", + base: "px4io/px4-dev-base-bionic:2020-01-10", + nuttx: "px4io/px4-dev-nuttx:2020-01-10", snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" ] @@ -70,7 +70,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + // docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } // } // options { // skipDefaultCheckout() diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index ca78e5e5df..c09fe777ce 100644 --- a/.ci/Jenkinsfile-hardware +++ b/.ci/Jenkinsfile-hardware @@ -12,7 +12,7 @@ pipeline { stage("build px4_fmu-v2_test") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -76,7 +76,7 @@ pipeline { stage("build px4_fmu-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -149,7 +149,7 @@ pipeline { stage("build px4_fmu-v4_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -222,7 +222,7 @@ pipeline { stage("build px4_fmu-v4pro_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -295,7 +295,7 @@ pipeline { stage("build px4_fmu-v5_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -368,7 +368,7 @@ pipeline { stage("build modalai_fc-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-11-22' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -441,7 +441,7 @@ pipeline { stage("build holybro_durandal-v1_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -515,7 +515,7 @@ pipeline { stage("build holybro_durandal-v1_stackcheck") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -602,7 +602,7 @@ pipeline { stage("build nxp_fmuk66-v3_default") { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/Jenkinsfile b/Jenkinsfile index eda8e5cfcf..dc448724ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { stage('Catkin build on ROS workspace') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2019-12-18' + image 'px4io/px4-dev-ros-melodic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -51,7 +51,7 @@ pipeline { stage('Colcon build on ROS2 workspace') { agent { docker { - image 'px4io/px4-dev-ros2-dashing:2019-12-18' + image 'px4io/px4-dev-ros2-dashing:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -82,7 +82,7 @@ pipeline { stage('Style check') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh 'make check_format' @@ -97,7 +97,7 @@ pipeline { stage('px4_io-v2 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-10-24' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -129,7 +129,7 @@ pipeline { stage('px4_fmu-v2 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -161,7 +161,7 @@ pipeline { stage('px4_fmu-v5 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -193,7 +193,7 @@ pipeline { stage('px4_sitl (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -225,7 +225,7 @@ pipeline { stage('px4_fmu-v5 (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -251,7 +251,7 @@ pipeline { stage('px4_sitl (no ninja)') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -277,7 +277,7 @@ pipeline { stage('SITL unit tests') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-12-18' + image 'px4io/px4-dev-base-bionic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -317,7 +317,7 @@ pipeline { stage('Clang analyzer') { agent { docker { - image 'px4io/px4-dev-clang:2019-12-18' + image 'px4io/px4-dev-clang:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -355,7 +355,7 @@ pipeline { stage('Clang tidy') { agent { docker { - image 'px4io/px4-dev-clang:2019-12-18' + image 'px4io/px4-dev-clang:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -377,7 +377,7 @@ pipeline { stage('Cppcheck') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-12-18' + image 'px4io/px4-dev-base-bionic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -415,7 +415,7 @@ pipeline { stage('Check stack') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -435,7 +435,7 @@ pipeline { stage('ShellCheck') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -454,7 +454,7 @@ pipeline { stage('Module config validation') { agent { docker { - image 'px4io/px4-dev-base-bionic:2019-12-18' + image 'px4io/px4-dev-base-bionic:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -479,7 +479,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh 'make distclean' @@ -498,7 +498,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh 'make distclean' @@ -517,7 +517,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh 'make distclean' @@ -537,7 +537,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2019-12-18' + image 'px4io/px4-dev-nuttx:2020-01-10' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -566,7 +566,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh('export') @@ -596,7 +596,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh('export') @@ -624,7 +624,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh('export') @@ -652,7 +652,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh('export') @@ -681,7 +681,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh('export') @@ -722,7 +722,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2019-12-18' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } } steps { sh('export')