Skip to content

Commit 4981db3

Browse files
Tweak sonar and add find step
1 parent f1b86d0 commit 4981db3

File tree

2 files changed

+23
-29
lines changed

2 files changed

+23
-29
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
PACKAGES=$(find . -maxdepth 5 -type f -name package.xml | sed 's/\.\///' | cut -d/ -f1)
6969
sed -i '/colcon build/ s/$/ --parallel-workers 4 --packages-up-to $PACKAGES --packages-ignore parking_planner parking_planner_nodes/' /home/carma/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash
7070
make_with_coverage.bash -m -e /opt/carma/ -o ./coverage_reports/gcov
71-
71+
- run: ls -la && pwd
7272
- name: Run C++ Tests
7373
continue-on-error: true
7474
run: |
@@ -77,7 +77,13 @@ jobs:
7777
export AUTOWARE_COMPILE_WITH_CUDA=1
7878
sed -i '/colcon test/ s/$/ --parallel-workers 4 --packages-above $PACKAGES --packages-ignore parking_planner parking_planner_nodes/' /home/carma/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash
7979
make_with_coverage.bash -t -e /opt/carma/ -o ./coverage_reports/gcov
80-
80+
- name: Find coverage info
81+
continue-on-error: true
82+
shell: bash
83+
run: |
84+
find "$GITHUB_WORKSPACE" -name "coverage.xml"
85+
ls -la && pwd
86+
find "$GITHUB_WORKSPACE" -name "gcov"
8187
- name: Run SonarScanner
8288
uses: usdot-fhwa-stol/actions/sonar-scanner@main
8389
with:

.sonarqube/sonar-scanner.properties

+15-27
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
sonar.projectKey=usdot-fhwa-stol_autoware.ai
1818
sonar.organization=usdot-fhwa-stol
1919
sonar.cfamily.cache.enabled=false
20-
sonar.cfamily.compile-commands=/opt/carma/autoware.ai/build/compile_commands.json
20+
sonar.cfamily.compile-commands=/opt/carma/src/autoware.ai/build/compile_commands.json
2121
sonar.host.url=https://sonarcloud.io
2222
sonar.cfamily.gcov.reportsPath=/opt/carma/coverage_reports/gcov
2323
sonar.coverageReportPaths=/opt/carma/coverage_reports/gcov/coverage.xml
@@ -42,41 +42,29 @@ sonar.modules= map_tools, \
4242
waypoint_planner, \
4343
twist_filter
4444

45-
map_tools.sonar.projectBaseDir = /opt/carma/autoware.ai/utilities/map_tools
46-
lidar_localizer.sonar.projectBaseDir = /opt/carma/autoware.ai/core_perception/lidar_localizer
47-
map_file.sonar.projectBaseDir = /opt/carma/autoware.ai/common/map_file
48-
deadreckoner.sonar.projectBaseDir = /opt/carma/autoware.ai/core_perception/deadreckoner
49-
points_downsampler.sonar.projectBaseDir = /opt/carma/autoware.ai/core_perception/points_downsampler
50-
points_preprocessor.sonar.projectBaseDir = /opt/carma/autoware.ai/core_perception/points_preprocessor
51-
waypoint_maker.sonar.projectBaseDir = /opt/carma/autoware.ai/core_planning/waypoint_maker
52-
as.sonar.projectBaseDir = /opt/carma/autoware.ai/drivers/as
53-
waypoint_planner.sonar.projectBaseDir = /opt/carma/autoware.ai/core_planning/waypoint_planner
54-
twist_filter.sonar.projectBaseDir = /opt/carma/autoware.ai/core_planning/twist_filter
45+
map_tools.sonar.projectBaseDir = /opt/carma/src/autoware.ai/utilities/map_tools
46+
lidar_localizer.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_perception/lidar_localizer
47+
map_file.sonar.projectBaseDir = /opt/carma/src/autoware.ai/common/map_file
48+
deadreckoner.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_perception/deadreckoner
49+
points_downsampler.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_perception/points_downsampler
50+
points_preprocessor.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_perception/points_preprocessor
51+
waypoint_maker.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_planning/waypoint_maker
52+
as.sonar.projectBaseDir = /opt/carma/src/autoware.ai/drivers/as
53+
waypoint_planner.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_planning/waypoint_planner
54+
twist_filter.sonar.projectBaseDir = /opt/carma/src/autoware.ai/core_planning/twist_filter
5555

5656
# C++ Package differences
5757
# Sources
5858
map_tools.sonar.sources = nodes
5959
lidar_localizer.sonar.sources = nodes
60-
map_file.sonar.sources = nodes, lib
60+
map_file.sonar.sources = nodes,lib
6161
deadreckoner.sonar.sources = nodes
6262
points_downsampler.sonar.sources = nodes
6363
points_preprocessor.sonar.sources = nodes
6464
waypoint_maker.sonar.sources = nodes
6565
as.sonar.sources = nodes
6666
waypoint_planner.sonar.sources = src
67-
twist_filter.sonar.sources = src
68-
twist_filter.sonar.exclusions =test/**
67+
twist_filter.sonar.sources = src
68+
twist_filter.sonar.exclusions = test/**
69+
twist_filter.sonar.tests = test
6970

70-
# Tests
71-
# Note: For C++ setting this field does not cause test analysis to occur. It only allows the test source code to be evaluated.
72-
# Uncomment packages as tests are added and enabled on CI
73-
#map_tools.sonar.tests = test
74-
#lidar_localizer.sonar.tests = test
75-
#map_file.sonar.tests = test
76-
#deadreckoner.sonar.tests = test
77-
#points_downsampler.sonar.tests = test
78-
#points_preprocessor.sonar.tests = test
79-
#waypoint_maker.sonar.tests = test
80-
#as.sonar.tests = test
81-
#waypoint_planner.sonar.tests = test
82-
twist_filter.sonar.tests = test

0 commit comments

Comments
 (0)