From 71306f7f83a83e44dc38624d4ccf846345a745e2 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 19 Nov 2020 11:07:47 -0500 Subject: [PATCH] update all container tags to 2020-11-18 --- .ci/Jenkinsfile-compile | 10 ++++---- .devcontainer/devcontainer.json | 2 +- .github/workflows/checks.yml | 9 +++++-- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/compile_linux.yml | 2 +- .github/workflows/compile_linux_arm64.yml | 2 +- .github/workflows/compile_nuttx.yml | 2 +- .github/workflows/coverage.yml | 4 ++- .github/workflows/mavros_avoidance_tests.yml | 6 +++-- .github/workflows/mavros_mission_tests.yml | 6 +++-- .github/workflows/mavros_offboard_tests.yml | 6 +++-- .github/workflows/metadata.yml | 14 +++++------ .github/workflows/sitl_tests.yml | 6 +++-- Jenkinsfile | 26 ++++++++++---------- Tools/docker_run.sh | 10 ++++---- 15 files changed, 61 insertions(+), 46 deletions(-) diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index ce603037b8..0283528b4a 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -9,10 +9,10 @@ pipeline { script { def build_nodes = [:] def docker_images = [ - armhf: "px4io/px4-dev-armhf:2020-04-01", - arm64: "px4io/px4-dev-aarch64:latest", - base: "px4io/px4-dev-base-bionic:2020-04-01", - nuttx: "px4io/px4-dev-nuttx-focal:2020-09-14", + armhf: "px4io/px4-dev-armhf:2020-11-18", + arm64: "px4io/px4-dev-aarch64:2020-11-18", + base: "px4io/px4-dev-base-bionic:2020-11-18", + nuttx: "px4io/px4-dev-nuttx-focal:2020-11-18", snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01" ] @@ -118,7 +118,7 @@ pipeline { // TODO: actually upload artifacts to S3 // stage('S3 Upload') { // agent { - // docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + // docker { image 'px4io/px4-dev-base-focal:2020-11-18' } // } // options { // skipDefaultCheckout() diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e0c1341bd3..9d9ac33721 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp { "name": "px4-dev-nuttx", - "image": "px4io/px4-dev-nuttx-focal:2020-09-14", + "image": "px4io/px4-dev-nuttx-focal:2020-11-18", "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 0b7a44c57d..a10b13a58a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -26,7 +26,9 @@ jobs: "module_documentation", "parameters_metadata", ] - container: px4io/px4-dev-nuttx-focal:2020-09-14 + container: + image: px4io/px4-dev-nuttx-focal:2020-11-18 + options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 with: @@ -53,6 +55,9 @@ jobs: echo "max_size = 400M" >> ~/.ccache/ccache.conf ccache -s ccache -z - + - name: check environment + run: | + export + ulimit -a - name: ${{matrix.check}} run: make ${{matrix.check}} diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 83fd8d2391..c9c2fd69b2 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-clang:2020-08-14 + container: px4io/px4-dev-clang:2020-11-18 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/compile_linux.yml b/.github/workflows/compile_linux.yml index 8ebe758eb4..ec1b40abad 100644 --- a/.github/workflows/compile_linux.yml +++ b/.github/workflows/compile_linux.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-armhf:2020-08-14 + container: px4io/px4-dev-armhf:2020-11-18 strategy: matrix: config: [ diff --git a/.github/workflows/compile_linux_arm64.yml b/.github/workflows/compile_linux_arm64.yml index 8a24f49a87..2de6ab1246 100644 --- a/.github/workflows/compile_linux_arm64.yml +++ b/.github/workflows/compile_linux_arm64.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-aarch64:latest + container: px4io/px4-dev-aarch64:2020-11-18 strategy: matrix: config: [ diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 8baea26381..fb5daaa560 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -11,7 +11,7 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx-focal:2020-09-14 + container: px4io/px4-dev-nuttx-focal:2020-11-18 strategy: matrix: config: [ diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f8f75fc630..3623a2b859 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,9 @@ on: jobs: build: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: + image: px4io/px4-dev-base-focal:2020-11-18 + options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined strategy: matrix: config: [ diff --git a/.github/workflows/mavros_avoidance_tests.yml b/.github/workflows/mavros_avoidance_tests.yml index ae04d3930c..52d62b761e 100644 --- a/.github/workflows/mavros_avoidance_tests.yml +++ b/.github/workflows/mavros_avoidance_tests.yml @@ -19,7 +19,7 @@ jobs: - {test_file: "mavros_posix_test_safe_landing.test", vehicle: "iris_obs_avoid", mission: "MC_safe_landing", build_type: "RelWithDebInfo"} container: - image: px4io/px4-dev-ros-melodic:2020-08-14 + image: px4io/px4-dev-ros-melodic:2020-11-18 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 @@ -49,7 +49,9 @@ jobs: ccache -z - name: check environment - run: export + run: | + export + ulimit -a - name: Build PX4 and sitl_gazebo env: PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}} diff --git a/.github/workflows/mavros_mission_tests.yml b/.github/workflows/mavros_mission_tests.yml index 5333e56249..2e063d1ce9 100644 --- a/.github/workflows/mavros_mission_tests.yml +++ b/.github/workflows/mavros_mission_tests.yml @@ -25,7 +25,7 @@ jobs: - {vehicle: "tiltrotor", mission: "VTOL_mission_1", build_type: "RelWithDebInfo"} container: - image: px4io/px4-dev-ros-melodic:2020-08-14 + image: px4io/px4-dev-ros-melodic:2020-11-18 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 @@ -55,7 +55,9 @@ jobs: ccache -z - name: check environment - run: export + run: | + export + ulimit -a - name: Build PX4 and sitl_gazebo env: PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}} diff --git a/.github/workflows/mavros_offboard_tests.yml b/.github/workflows/mavros_offboard_tests.yml index b6044fc302..2839c0e5b7 100644 --- a/.github/workflows/mavros_offboard_tests.yml +++ b/.github/workflows/mavros_offboard_tests.yml @@ -20,7 +20,7 @@ jobs: #- {test_file: "mavros_posix_tests_offboard_rpyrt_ctl.test", vehicle: "iris", build_type: "RelWithDebInfo"} container: - image: px4io/px4-dev-ros-melodic:2020-08-14 + image: px4io/px4-dev-ros-melodic:2020-11-18 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 @@ -50,7 +50,9 @@ jobs: ccache -z - name: check environment - run: export + run: | + export + ulimit -a - name: Build PX4 and sitl_gazebo env: PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}} diff --git a/.github/workflows/metadata.yml b/.github/workflows/metadata.yml index 0a2e3c3e38..0abb2891e4 100644 --- a/.github/workflows/metadata.yml +++ b/.github/workflows/metadata.yml @@ -12,7 +12,7 @@ jobs: airframe: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: px4io/px4-dev-base-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: @@ -27,7 +27,7 @@ jobs: module: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: px4io/px4-dev-base-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: @@ -42,7 +42,7 @@ jobs: parameter: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: px4io/px4-dev-base-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: @@ -57,7 +57,7 @@ jobs: uorb_graph: runs-on: ubuntu-latest - container: px4io/px4-dev-nuttx-focal:2020-09-14 + container: px4io/px4-dev-nuttx-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: @@ -72,7 +72,7 @@ jobs: micrortps_agent: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: px4io/px4-dev-base-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: @@ -86,7 +86,7 @@ jobs: ROS_msgs: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: px4io/px4-dev-base-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: @@ -99,7 +99,7 @@ jobs: ROS2_bridge: runs-on: ubuntu-latest - container: px4io/px4-dev-base-focal:2020-09-14 + container: px4io/px4-dev-base-focal:2020-11-18 steps: - uses: actions/checkout@v1 with: diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml index 34481c0e4e..f8739146c6 100644 --- a/.github/workflows/sitl_tests.yml +++ b/.github/workflows/sitl_tests.yml @@ -20,7 +20,7 @@ jobs: - {latitude: "29.660316", longitude: "-82.316658", altitude: "30", build_type: "RelWithDebInfo", model: "tailsitter" } # Florida - {latitude: "47.397742", longitude: "8.545594", altitude: "488", build_type: "Coverage", model: "standard_vtol" } # Zurich container: - image: px4io/px4-dev-simulation-focal:2020-08-14 + image: px4io/px4-dev-simulation-focal:2020-11-18 options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined steps: - uses: actions/checkout@v1 @@ -60,7 +60,9 @@ jobs: PX4_HOME_LON: ${{matrix.config.longitude}} PX4_HOME_ALT: ${{matrix.config.altitude}} PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}} - run: export + run: | + export + ulimit -a - name: Build PX4 env: PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}} diff --git a/Jenkinsfile b/Jenkinsfile index 59a8c226fb..77b5be826c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { // stage('Catkin build on ROS workspace') { // agent { // docker { - // image 'px4io/px4-dev-ros-melodic:2020-08-20' + // image 'px4io/px4-dev-ros-melodic:2020-11-18' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' // } // } @@ -56,7 +56,7 @@ pipeline { stage('Colcon build on ROS2 workspace') { agent { docker { - image 'px4io/px4-dev-ros2-foxy:2020-08-20' + image 'px4io/px4-dev-ros2-foxy:2020-11-18' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -87,7 +87,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh 'make distclean' @@ -106,7 +106,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh 'make distclean' @@ -125,7 +125,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh 'make distclean' @@ -145,7 +145,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx-focal:2020-09-14' + image 'px4io/px4-dev-nuttx-focal:2020-11-18' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -174,7 +174,7 @@ pipeline { stage('Devguide') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') @@ -204,7 +204,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') @@ -234,7 +234,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') @@ -262,7 +262,7 @@ pipeline { stage('microRTPS agent') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') @@ -292,7 +292,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') @@ -321,7 +321,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') @@ -364,7 +364,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-focal:2020-09-14' } + docker { image 'px4io/px4-dev-base-focal:2020-11-18' } } steps { sh('export') diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index 9e6a9740d0..b6e245d920 100755 --- a/Tools/docker_run.sh +++ b/Tools/docker_run.sh @@ -4,10 +4,10 @@ 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-focal:2020-09-14" + PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-11-18" elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]]; then # aerotenna_ocpoc_default, beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-11-18" elif [[ $@ =~ .*pilotpi.arm64 ]]; then # scumaker_pilotpi_arm64 PX4_DOCKER_REPO="px4io/px4-dev-aarch64:latest" @@ -16,13 +16,13 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2020-04-01" elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then # aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default - PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-armhf:2020-11-18" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools - PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-clang:2020-11-18" elif [[ $@ =~ .*tests* ]]; then # run all tests with simulation - PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-04-01" + PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2020-11-18" fi else echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";