Refs #20542: Manual cherry-pick of PR #4549

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Mar 13, 2024 · 51cac8e · 51cac8e
1 parent 6a7de71
commit 51cac8e
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 298 deletions.
diff --git a/.github/workflows/config/asan_colcon.meta b/.github/workflows/config/asan_colcon.meta
@@ -1,31 +1,18 @@
-{
-    "names":
-    {
-        "fastrtps":
-        {
-            "cmake-args":
-            [
-                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DEPROSIMA_BUILD_TESTS=ON",
-                "-DRTPS_API_TESTS=ON",
-                "-DFASTRTPS_API_TESTS=ON",
-                "-DFASTDDS_PIM_API_TESTS=ON",
-                "-DPERFORMANCE_TESTS=ON",
-                "-DNO_TLS=OFF",
-                "-DSECURITY=ON",
-                "-DFASTDDS_STATISTICS=ON",
-                "-DSANITIZER=Address",
-                "-DCMAKE_CXX_FLAGS='-Werror'"
-            ]
-        },
-
-        "discovery-server":
-        {
-            "cmake-args":
-            [
-                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DSANITIZER=Address",
-            ]
-        }
-    }
-}
+names:
+    fastrtps:
+        cmake-args:
+            - "-DCMAKE_BUILD_TYPE=Debug"
+            - "-DEPROSIMA_BUILD_TESTS=ON"
+            - "-DRTPS_API_TESTS=ON"
+            - "-DFASTRTPS_API_TESTS=ON"
+            - "-DFASTDDS_PIM_API_TESTS=ON"
+            - "-DPERFORMANCE_TESTS=ON"
+            - "-DNO_TLS=OFF"
+            - "-DSECURITY=ON"
+            - "-DFASTDDS_STATISTICS=ON"
+            - "-DSANITIZER=Address"
+            - "-DCMAKE_CXX_FLAGS='-Werror'"
+    discovery-server:
+        cmake-args:
+            - "-DCMAKE_BUILD_TYPE=Debug"
+            - "-DSANITIZER=Address"
diff --git a/.github/workflows/config/default_ci.meta → .github/workflows/config/ci.meta b/.github/workflows/config/default_ci.meta → .github/workflows/config/ci.meta
@@ -15,7 +15,6 @@ names:
             - "-DNO_TLS=OFF"
             - "-DPERFORMANCE_TESTS=ON"
             - "-DPROFILING_TESTS=OFF"
-            - "-DSECURITY=ON"
             - "-DSHM_TRANSPORT_DEFAULT=ON"
             - "-DSTRICT_REALTIME=OFF"
             - "-DSYSTEM_TESTS=ON"

diff --git a/.github/workflows/config/ci.repos b/.github/workflows/config/ci.repos
@@ -0,0 +1,5 @@
+repositories:
+    googletest-distribution:
+        type: git
+        url: https://github.com/google/googletest.git
+        version: release-1.11.0
diff --git a/.github/workflows/config/coverage.repos b/.github/workflows/config/coverage.repos
diff --git a/.github/workflows/config/default_ci_2.10.x.repos b/.github/workflows/config/default_ci_2.10.x.repos
diff --git a/.github/workflows/config/default_ci_2.12.x.repos b/.github/workflows/config/default_ci_2.12.x.repos
diff --git a/.github/workflows/config/default_ci_2.13.x.repos b/.github/workflows/config/default_ci_2.13.x.repos
diff --git a/.github/workflows/config/default_ci_2.6.x.repos b/.github/workflows/config/default_ci_2.6.x.repos
diff --git a/.github/workflows/config/default_ci_master.repos b/.github/workflows/config/default_ci_master.repos
diff --git a/.github/workflows/config/tsan_colcon.meta b/.github/workflows/config/tsan_colcon.meta
@@ -1,31 +1,18 @@
-{
-    "names":
-    {
-        "fastcdr":
-        {
-            "cmake-args":
-            [
-                "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
-                "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
-            ]
-        },
-        "fastrtps":
-        {
-            "cmake-args":
-            [
-                "-DCOMPILE_EXAMPLES=OFF",
-                "-DEPROSIMA_BUILD_TESTS=ON",
-                "-DRTPS_API_TESTS=ON",
-                "-DFASTRTPS_API_TESTS=OFF",
-                "-DFASTDDS_PIM_API_TESTS=ON",
-                "-DPERFORMANCE_TESTS=ON",
-                "-DNO_TLS=OFF",
-                "-DSECURITY=ON",
-                "-DFASTDDS_STATISTICS=ON",
-                "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
-                "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
-            ]
-        }
-
-    }
-}
+names:
+    fastcdr:
+        cmake-args:
+            - "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
+            - "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
+    fastrtps:
+        cmake-args:
+            - "-DCOMPILE_EXAMPLES=OFF"
+            - "-DEPROSIMA_BUILD_TESTS=ON"
+            - "-DRTPS_API_TESTS=ON"
+            - "-DFASTRTPS_API_TESTS=OFF"
+            - "-DFASTDDS_PIM_API_TESTS=ON"
+            - "-DPERFORMANCE_TESTS=ON"
+            - "-DNO_TLS=OFF"
+            - "-DSECURITY=ON"
+            - "-DFASTDDS_STATISTICS=ON"
+            - "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
+            - "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -44,6 +44,6 @@ jobs:
     with:
       label: ${{ inputs.label || 'mac-ci' }}
       colcon-args: ${{ inputs.colcon-args }}
-      cmake-args: ${{ inputs.cmake-args }}
+      cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args }}
       fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '2.13.x' }}
diff --git a/.github/workflows/rebase-3.0.x-devel.yaml b/.github/workflows/rebase-3.0.x-devel.yaml
diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml
@@ -82,38 +82,19 @@ jobs:
       # TODO(eduponz): Set up libp11 and SoftHSM. NOTE: using SoftHSM requires adding the runner to a group,
       #                which entails logout/login or rebooting the machine. This is not feasible in a CI environment.
 
-      - name: Prepare colcon workspace
-        id: colcon_ws_setup
-        run: |
-          # Nightly job
-          if [[ "${{ inputs.label }}" == *"nightly"* ]]
-          then
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
-            if [ ! -f ${DEPENDS_REPOS_PATH} ]
-            then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_2.13.x.repos"
-            fi
-            META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
-
-          # Either PR or manual
-          else
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
-            if [ ! -f ${DEPENDS_REPOS_PATH} ]
-            then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_2.13.x.repos"
-            fi
-            META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
-          fi
-
-          echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
-          cat ${DEPENDS_REPOS_PATH}
-
-          echo "Selected metas files: ${META_PATH}"
-          cp ${META_PATH} ci.meta
-          cat ci.meta
+      - name: Fetch Fast DDS dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
+        with:
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
-          # Create source dir and download the sources
-          vcs import src --input ${DEPENDS_REPOS_PATH} --skip-existing
+      - name: Fetch Fast DDS CI dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
+        with:
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
       # TODO(eduponz): There is a warning in clang >= 16 regarding enum-constexpr-conversion:
       #   - Issue: https://github.com/boostorg/mpl/issues/69.
@@ -123,7 +104,7 @@ jobs:
         continue-on-error: false
         uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
         with:
-          colcon_meta_file: ${{ github.workspace }}/ci.meta
+          colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
           colcon_build_args: ${{ inputs.colcon-args }}
           cmake_args: ${{ inputs.cmake-args }}
           cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall -Wno-enum-constexpr-conversion"

diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -76,44 +76,25 @@ jobs:
       # TODO(eduponz): Set up libp11 and SoftHSM. NOTE: using SoftHSM requires adding the runner to a group,
       #                which entails logout/login or rebooting the machine. This is not feasible in a CI environment.
 
-      - name: Prepare colcon workspace
-        id: colcon_ws_setup
-        run: |
-          # Nightly job
-          if [[ "${{ inputs.label }}" == *"nightly"* ]]
-          then
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
-            if [ ! -f ${DEPENDS_REPOS_PATH} ]
-            then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_master.repos"
-            fi
-            META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
-
-          # Either PR or manual
-          else
-            DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
-            if [ ! -f ${DEPENDS_REPOS_PATH} ]
-            then
-              DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_master.repos"
-            fi
-            META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
-          fi
-
-          echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
-          cat ${DEPENDS_REPOS_PATH}
-
-          echo "Selected metas files: ${META_PATH}"
-          cp ${META_PATH} ci.meta
-          cat ci.meta
+      - name: Fetch Fast DDS dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
+        with:
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
-          # Create source dir and download the sources
-          vcs import src --input ${DEPENDS_REPOS_PATH} --skip-existing
+      - name: Fetch Fast DDS CI dependencies
+        uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
+        with:
+          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.repos
+          destination_workspace: src
+          skip_existing: 'true'
 
       - name: Colcon build
         continue-on-error: false
         uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
         with:
-          colcon_meta_file: ${{ github.workspace }}/ci.meta
+          colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
           colcon_build_args: ${{ inputs.colcon-args }}
           cmake_args: ${{ inputs.cmake-args }}
           cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall"