Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker cleanup #2238

Merged
merged 5 commits into from
Mar 4, 2024
+51 −536
Merged

Docker cleanup #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0420e4e
docker: remove unused SITL testing images
julianoes Mar 4, 2024
a5d2d98
docker: bump dockcross versions up
julianoes Mar 4, 2024
af392ba
docker: rename dev image
julianoes Mar 4, 2024
f9b630d
integration_tests: no more special test class
julianoes Mar 4, 2024
e8b1f54
CI: invalidate cache for arm builds
julianoes Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ jobs:
id: cache
with:
path: ./build/linux-${{ matrix.arch_name }}/third_party/install
key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-4
key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-5
- name: disable superbuild on cache hit
if: steps.cache.outputs.cache-hit == 'true'
run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/linux-${{ matrix.arch_name }}/third_party/install" >> $GITHUB_ENV
Expand Down
59 changes: 0 additions & 59 deletions docker/Dockerfile-Ubuntu-20.04
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions docker/Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions docker/Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions docker/Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions docker/Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13
View file
Open in desktop

This file was deleted.

0 docker/Dockerfile-Ubuntu-22.04 → docker/Dockerfile-dev
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docker/Dockerfile.dockcross-linux-arm64-custom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dockcross/linux-arm64-lts
FROM dockcross/linux-arm64

ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-arm64-custom

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.dockcross-linux-armv6-custom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dockcross/linux-armv6-lts
FROM dockcross/linux-armv6

ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv6-custom

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.dockcross-linux-armv7-custom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dockcross/linux-armv7-lts
FROM dockcross/linux-armv7

ENV DEFAULT_DOCKCROSS_IMAGE mavsdk/mavsdk-dockcross-linux-armv7-custom

Expand Down
16 changes: 2 additions & 14 deletions docker/build_and_push_docker_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,12 @@ then
DOCKER_CMD=podman
fi

$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04 -t mavsdk/mavsdk-ubuntu-20.04 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-22.04 -t mavsdk/mavsdk-ubuntu-22.04 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.11 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-PX4-SITL-v1.12 -t mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-22.04-PX4-SITL-v1.13 -t mavsdk/mavsdk-ubuntu-22.04-px4-sitl-v1.13 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-APM-SITL-Copter-4.1.2 -t mavsdk/mavsdk-ubuntu-20.04-apm-sitl-copter-4.1.2 .
$DOCKER_CMD build -f Dockerfile-Ubuntu-20.04-APM-SITL-Rover-4.1.2 -t mavsdk/mavsdk-ubuntu-20.04-apm-sitl-rover-4.1.2 .
$DOCKER_CMD build -f Dockerfile-dev -t mavsdk/mavsdk-dev .
$DOCKER_CMD build -f Dockerfile.dockcross-linux-armv6-custom -t mavsdk/mavsdk-dockcross-linux-armv6-custom .
$DOCKER_CMD build -f Dockerfile.dockcross-linux-armv7-custom -t mavsdk/mavsdk-dockcross-linux-armv7-custom .
$DOCKER_CMD build -f Dockerfile.dockcross-linux-arm64-custom -t mavsdk/mavsdk-dockcross-linux-arm64-custom .

$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.11:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-px4-sitl-v1.12:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-22.04-px4-sitl-v1.13:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-apm-sitl-copter-4.1.2:latest
$DOCKER_CMD push mavsdk/mavsdk-ubuntu-20.04-apm-sitl-rover-4.1.2:latest
$DOCKER_CMD push mavsdk/mavsdk-dev:latest
$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv6-custom:latest
$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-armv7-custom:latest
$DOCKER_CMD push mavsdk/mavsdk-dockcross-linux-arm64-custom:latest
13 changes: 0 additions & 13 deletions src/integration_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,3 @@ target_link_libraries(integration_tests_runner
add_test(integration_tests
integration_tests_runner
)

add_custom_command(TARGET integration_tests_runner
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/start_sitl.sh
${CMAKE_CURRENT_BINARY_DIR}
)
add_custom_command(TARGET integration_tests_runner
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/../../tools/stop_sitl.sh
${CMAKE_CURRENT_BINARY_DIR}
)
2 changes: 1 addition & 1 deletion src/integration_tests/action_goto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using namespace mavsdk;

TEST_F(SitlTest, PX4ActionGoto)
TEST(SitlTest, PX4ActionGoto)
{
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};

Expand Down
2 changes: 1 addition & 1 deletion src/integration_tests/action_hold.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using namespace mavsdk;

TEST_F(SitlTest, PX4ActionHold)
TEST(SitlTest, PX4ActionHold)
{
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};

Expand Down
2 changes: 1 addition & 1 deletion src/integration_tests/action_hover_async.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using namespace mavsdk;

TEST_F(SitlTest, ActionHoverAsync)
TEST(SitlTest, ActionHoverAsync)
{
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};

Expand Down
12 changes: 6 additions & 6 deletions src/integration_tests/action_hover_sync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@ using namespace mavsdk;
static void takeoff_and_hover_at_altitude(float altitude_m);
void takeoff_and_hover_at_altitude_apm(float altitude_m);

TEST_F(SitlTest, PX4ActionHoverSyncDefault)
TEST(SitlTest, PX4ActionHoverSyncDefault)
{
takeoff_and_hover_at_altitude(2.5);
}

TEST_F(SitlTest, PX4ActionHoverSyncHigher)
TEST(SitlTest, PX4ActionHoverSyncHigher)
{
takeoff_and_hover_at_altitude(5.0f);
}

TEST_F(SitlTest, PX4ActionHoverSyncLower)
TEST(SitlTest, PX4ActionHoverSyncLower)
{
// TODO: less than 1.0 is currently failing due to a Firmware bug.
// https://github.com/PX4/Firmware/issues/12471
takeoff_and_hover_at_altitude(1.5f);
}

TEST_F(SitlTest, APMActionHoverSyncDefault)
TEST(SitlTest, APMActionHoverSyncDefault)
{
takeoff_and_hover_at_altitude_apm(2.5);
}

TEST_F(SitlTest, APMActionHoverSyncHigher)
TEST(SitlTest, APMActionHoverSyncHigher)
{
takeoff_and_hover_at_altitude_apm(5.0f);
}

TEST_F(SitlTest, APMActionHoverSyncLower)
TEST(SitlTest, APMActionHoverSyncLower)
{
// TODO: less than 1.0 is currently failing due to a Firmware bug.
// https://github.com/PX4/Firmware/issues/12471
Expand Down
3 changes: 2 additions & 1 deletion src/integration_tests/action_takeoff_and_kill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#include <iostream>
#include <future>
#include "integration_test_helper.h"
#include "mavsdk.h"
#include "plugins/action/action.h"
#include "plugins/telemetry/telemetry.h"

using namespace mavsdk;

TEST_F(SitlTest, ActionTakeoffAndKill)
TEST(SitlTest, ActionTakeoffAndKill)
{
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
ASSERT_EQ(mavsdk.add_udp_connection(), ConnectionResult::Success);
Expand Down
2 changes: 1 addition & 1 deletion src/integration_tests/action_transition_multicopter_fixedwing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using namespace mavsdk;

TEST_F(SitlTest, PX4ActionTransitionSync_standard_vtol)
TEST(SitlTest, PX4ActionTransitionSync_standard_vtol)
{
// Init & connect
Mavsdk mavsdk{Mavsdk::Configuration{Mavsdk::ComponentType::GroundStation}};
Expand Down
Loading
Loading