Merge pull request #1190 from mavlink/pr-update-docker

Update docker image to PX4 v1.11.0
mavlink · Sep 17, 2020 · 14d497f · 14d497f
2 parents 0984934 + ed301b4
commit 14d497f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 b/docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11
@@ -1,5 +1,5 @@
 #
-# PX4 v1.11.0-rc1 SITL testing environment for MAVSDK based on Ubuntu 20.04.
+# PX4 v1.11.0 SITL testing environment for MAVSDK based on Ubuntu 20.04.
 # Author: Julian Oes <julian@oes.ch>
 #
 FROM mavsdk/mavsdk-ubuntu-20.04
@@ -19,7 +19,7 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 RUN git clone https://github.com/PX4/Firmware.git ${FIRMWARE_DIR}
-RUN git -C ${FIRMWARE_DIR} checkout v1.11.0-rc3 # later: v1.11.0
+RUN git -C ${FIRMWARE_DIR} checkout v1.11.0
 RUN git -C ${FIRMWARE_DIR} submodule update --init --recursive
 RUN cd ${FIRMWARE_DIR} && Tools/setup/ubuntu.sh --no-nuttx
 RUN cd ${FIRMWARE_DIR} && DONT_RUN=1 make px4_sitl gazebo && DONT_RUN=1 make px4_sitl gazebo
diff --git a/src/integration_tests/action_hover_sync.cpp b/src/integration_tests/action_hover_sync.cpp
@@ -64,7 +64,7 @@ void takeoff_and_hover_at_altitude(float altitude_m)
 
     EXPECT_TRUE(poll_condition_with_timeout(
         [telemetry]() { return telemetry->flight_mode() == Telemetry::FlightMode::Hold; },
-        std::chrono::seconds(10)));
+        std::chrono::seconds(20)));
 
     // We need to wait a bit until it stabilizes.
     std::this_thread::sleep_for(std::chrono::seconds(5));