From e64c38fa259aac2a8f5b1415243eb7714035d017 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 13 Jan 2020 10:10:50 +0100 Subject: [PATCH] CI: update all 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 ++++---- .circleci/config.yml | 2 +- .github/workflows/build_tests.yml | 2 +- .github/workflows/ccpp.yml | 2 +- .github/workflows/compile_nuttx.yml | 2 +- .github/workflows/sitl_tests.yml | 2 +- .github/workflows/sitl_tests_coverage.yml | 2 +- Jenkinsfile | 52 +++++++++++------------ 12 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests index 13886b3e12..b689ae0beb 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:2020-01-10' + image 'px4io/px4-dev-ros-melodic:2020-01-13' 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:2020-01-10").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-01-13").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 34b7dfae16..769102e54a 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:2020-01-10' + image 'px4io/px4-dev-ros-melodic:2020-01-13' 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:2020-01-10").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-01-13").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 224bf619bc..4ab4c738dc 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:2020-01-10' + image 'px4io/px4-dev-base-bionic:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-base-bionic:2020-01-13' 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:2020-01-10").inside('-e HOME=${WORKSPACE}') { + docker.image("px4io/px4-dev-ros-melodic:2020-01-13").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 4fff9d80ab..30e0c5d172 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:2020-01-10", - base: "px4io/px4-dev-base-bionic:2020-01-10", - nuttx: "px4io/px4-dev-nuttx:2020-01-10", + armhf: "px4io/px4-dev-armhf:2020-01-13", + base: "px4io/px4-dev-base-bionic:2020-01-13", + nuttx: "px4io/px4-dev-nuttx:2020-01-13", 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:2020-01-10' } + // docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } // } // options { // skipDefaultCheckout() diff --git a/.ci/Jenkinsfile-hardware b/.ci/Jenkinsfile-hardware index c09fe777ce..c9e287c182 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f59ab0ba2..70da8f6aef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: px4io/px4-dev-nuttx:2020-01-10 + - image: px4io/px4-dev-nuttx:2020-01-13 steps: - checkout - run: diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 183f7a4b62..368e7e7fd1 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-base-bionic:2020-01-10 + container: px4io/px4-dev-base-bionic:2020-01-13 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 18cbe244fb..13882f147e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-base-bionic:2020-01-10 + container: px4io/px4-dev-base-bionic:2020-01-13 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index a56fcf26e0..a0cd6ca325 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx:2020-01-10 + container: px4io/px4-dev-nuttx:2020-01-13 strategy: matrix: config: [ diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml index 3e18405d72..5ee92f0eb6 100644 --- a/.github/workflows/sitl_tests.yml +++ b/.github/workflows/sitl_tests.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-simulation-bionic:2020-01-10 + container: px4io/px4-dev-simulation-bionic:2020-01-13 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/sitl_tests_coverage.yml b/.github/workflows/sitl_tests_coverage.yml index 813a233dca..f36ea56e8e 100644 --- a/.github/workflows/sitl_tests_coverage.yml +++ b/.github/workflows/sitl_tests_coverage.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-simulation-bionic:2020-01-10 + container: px4io/px4-dev-simulation-bionic:2020-01-13 steps: - uses: actions/checkout@v1 with: diff --git a/Jenkinsfile b/Jenkinsfile index dc448724ff..bb32fb047d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { stage('Catkin build on ROS workspace') { agent { docker { - image 'px4io/px4-dev-ros-melodic:2020-01-10' + image 'px4io/px4-dev-ros-melodic:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-ros2-dashing:2020-01-13' 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:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh 'make check_format' @@ -97,7 +97,7 @@ pipeline { stage('px4_io-v2 (bloaty)') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-base-bionic:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-clang:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-clang:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-base-bionic:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' + image 'px4io/px4-dev-base-bionic:2020-01-13' 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:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh 'make distclean' @@ -498,7 +498,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh 'make distclean' @@ -517,7 +517,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh 'make distclean' @@ -537,7 +537,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx:2020-01-10' + image 'px4io/px4-dev-nuttx:2020-01-13' 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:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh('export') @@ -596,7 +596,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh('export') @@ -624,7 +624,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh('export') @@ -652,7 +652,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh('export') @@ -681,7 +681,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh('export') @@ -722,7 +722,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-bionic:2020-01-10' } + docker { image 'px4io/px4-dev-base-bionic:2020-01-13' } } steps { sh('export')