Upgrade to macOS Sequoia (#6070) (#6166)

* Refs #23750. Change runner in CI.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Update platform support.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Apply suggestion.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Update to macos-15.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Do not build IPv6 blackbox tests in Mac.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Exclude whitelist tests.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Fix DataWriterTests.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Change blacklisting of IPv6 test.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23750. Remove multicast from DDSPersistenceTests.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 9ecbd27)

# Conflicts:
#	.github/workflows/reusable-mac-ci.yml
#	PLATFORM_SUPPORT.md
#	test/blackbox/common/DDSBlackboxTestsPersistence.cpp
#	test/unittest/dds/publisher/DataWriterTests.cpp

Co-authored-by: Miguel Company <[email protected]>

Author: mergify[bot]

.github/workflows/reusable-mac-ci.yml

@@ -29,19 +29,16 @@ on:
         type: boolean
         default: false
 
+env:
+  test_blocklist: 'InterfaceWhitelist|send_to_allowed_interface|v6'
+
 defaults:
   run:
     shell: bash
 
 jobs:
   reusable-mac-ci:
-    # As explained in https://github.com/actions/runner-images/tree/main?tab=readme-ov-file#available-images,
-    # *-latest images are not always the latest available versions. The minimum version of the macOS image
-    # with clang 15 is macos-13 (see
-    # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#language-and-runtime),
-    # so we'll use that one for now, as clang 15 is the supported compiler for Fast DDS in macOS.
-    # (see https://github.com/eProsima/Fast-DDS/blob/master/PLATFORM_SUPPORT.md#compilers)
-    runs-on: macos-13
+    runs-on: macos-15-intel
     strategy:
       fail-fast: false
       matrix:
@@ -138,7 +135,9 @@ jobs:
           colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/fastdds_test.meta
           colcon_test_args: ${{ inputs.colcon-args }}
           colcon_test_args_default: --event-handlers=console_direct+
-          ctest_args: ${{ inputs.ctest-args }}
+          ctest_args: >
+            ${{ inputs.ctest-args }}
+            ${{ format('-E "{0}"', env.test_blocklist) }}
           packages_names: fastrtps
           workspace: ${{ github.workspace }}
           test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}

PLATFORM_SUPPORT.md

@@ -31,12 +31,12 @@ Community members may provide assistance with these platforms.
 
 ## Platforms
 
-|Architecture|Ubuntu Focal (20.04)|MacOS Mojave (10.14)|Windows 10 (VS2019)|Debian Buster (10)|
-|------------|--------------------|--------------------|-------------------|------------------|
-|amd64       |Tier 1 [^a][^s]     |Tier 1 [^s]         |Tier 1 [^a][^s]    |Tier 3 [^s]       |
-|amd32       |                    |                    |Tier 2 [^a][^s]    |                  |
-|arm64       |Tier 1 [^a][^s]     |                    |                   |Tier 3 [^s]       |
-|arm32       |Tier 3 [^s]         |                    |                   |Tier 3 [^s]       |
+|Architecture|Ubuntu Focal (20.04)|MacOS Sequoia (15)|Windows 10 (VS2019)|Debian Buster (10)|
+|------------|--------------------|------------------|-------------------|------------------|
+|amd64       |Tier 1 [^a][^s]     |Tier 1 [^s]       |Tier 1 [^a][^s]    |Tier 3 [^s]       |
+|amd32       |                    |                  |Tier 2 [^a][^s]    |                  |
+|arm64       |Tier 1 [^a][^s]     |                  |                   |Tier 3 [^s]       |
+|arm32       |Tier 3 [^s]         |                  |                   |Tier 3 [^s]       |
 
 [^a]: Binary releases are provided as a single archive per platform.
 [^s]: Compilation from source.
@@ -46,7 +46,7 @@ Community members may provide assistance with these platforms.
 Tier 1 compilers and minimum supported versions:
 
 * GCC 9
-* Clang 12
+* Clang 16
 * MSVC v142 (Visual Studio 2019)
 
 Tier 2 compilers:

test/blackbox/common/DDSBlackboxTestsPersistence.cpp

@@ -369,16 +369,6 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
         R_UNICAST_PORT_RANDOM_NUMBER_STR = "7421";
     }
     int32_t R_UNICAST_PORT_RANDOM_NUMBER = stoi(R_UNICAST_PORT_RANDOM_NUMBER_STR);
-    value = std::getenv("MULTICAST_PORT_RANDOM_NUMBER");
-    if (value != nullptr)
-    {
-        MULTICAST_PORT_RANDOM_NUMBER_STR = value;
-    }
-    else
-    {
-        MULTICAST_PORT_RANDOM_NUMBER_STR = "7400";
-    }
-    int32_t MULTICAST_PORT_RANDOM_NUMBER = stoi(MULTICAST_PORT_RANDOM_NUMBER_STR);
 
     PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);
 
@@ -390,18 +380,12 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
     IPLocator::setIPv4(LocatorBuffer, 127, 0, 0, 1);
     WriterUnicastLocators.push_back(LocatorBuffer);
 
-    LocatorList_t WriterMulticastLocators;
-
-    LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
-    WriterMulticastLocators.push_back(LocatorBuffer);
-
     writer
             .history_kind(eprosima::fastrtps::KEEP_ALL_HISTORY_QOS)
             .reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
             .make_persistent(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.1")
             .static_discovery("file://PubSubWriterPersistence.xml")
             .unicastLocatorList(WriterUnicastLocators)
-            .multicastLocatorList(WriterMulticastLocators)
             .setPublisherIDs(1, 2)
             .setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
             .userData({'V', 'G', 'W', 0x78, 0x73, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x70, 0x65, 0x72, 0x73, 0x5f, 0x67,
@@ -417,19 +401,13 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
     LocatorBuffer.port = static_cast<uint16_t>(R_UNICAST_PORT_RANDOM_NUMBER);
     ReaderUnicastLocators.push_back(LocatorBuffer);
 
-    LocatorList_t ReaderMulticastLocators;
-
-    LocatorBuffer.port = static_cast<uint16_t>(MULTICAST_PORT_RANDOM_NUMBER);
-    ReaderMulticastLocators.push_back(LocatorBuffer);
-
     reader
             .history_kind(eprosima::fastrtps::KEEP_LAST_HISTORY_QOS)
             .history_depth(10)
             .reliability(eprosima::fastrtps::RELIABLE_RELIABILITY_QOS)
             .make_persistent(db_file_name(), "78.73.69.74.65.72.5f.70.65.72.73.5f|67.75.69.3")
             .static_discovery("file://PubSubReaderPersistence.xml")
             .unicastLocatorList(ReaderUnicastLocators)
-            .multicastLocatorList(ReaderMulticastLocators)
             .setSubscriberIDs(3, 4)
             .setManualTopicName(std::string("BlackBox_StaticDiscovery_") + TOPIC_RANDOM_NUMBER)
             .init();
@@ -450,7 +428,7 @@ TEST_P(PersistenceLargeData, PubSubAsReliablePubPersistentWithStaticDiscovery)
 
     reader.startReception(unreceived_data);
 
-    // Wait expecting not receiving data.
+    // Wait expecting receiving data.
     ASSERT_EQ(10u, reader.block_for_all(std::chrono::seconds(1)));
 
 

test/unittest/dds/publisher/DataWriterTests.cpp

@@ -731,7 +731,7 @@ TEST(DataWriterTests, Write)
     data.message("HelloWorld");
     ASSERT_TRUE(datawriter->write(&data, fastrtps::rtps::c_InstanceHandle_Unknown) ==
             ReturnCode_t::RETCODE_OK);
-    ASSERT_TRUE(datawriter->write(&data, participant->get_instance_handle()) ==
+    ASSERT_TRUE(datawriter->write(&data, datawriter->get_instance_handle()) ==
             ReturnCode_t::RETCODE_PRECONDITION_NOT_MET);
 
     ASSERT_TRUE(publisher->delete_datawriter(datawriter) == ReturnCode_t::RETCODE_OK);