Merge release/omega (4.8.0) branch into master #232
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description Temporarily disabled old failing unit tests, to be able to use CI for new development <!--- Describe your changes in detail --> ## Related GitHub Issue [CARMA Platform #2335](usdot-fhwa-stol/carma-platform#2335) <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key https://usdot-carma.atlassian.net/browse/CAR-6008 ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details This PR updates a unit test in emergency_response_vehicle_plugin which to use` ament_index_cpp::get_package_share_directory()` to access a csv file with route destinations. This fixes the unit test which was failing previously. ## Description <!--- Describe your changes in detail --> ## Related GitHub Issue usdot-fhwa-stol/carma-platform#2335 <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key <!-- e.g. CAR-123 --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [x] All new and existing tests passed.
# PR Details ## Description Merge PR to formalize release of master into develop as part of CARMA release process for 4.5.0. PR created automatically via CARMA release tool and Github CLI ## Motivation and Context This PR brings the tested and reviewed contents of the master release/candidate into develop for final release preparation ## How Has This Been Tested? This release branch (minus final version number changes) has been tested through the CARMA verification test plan. ## Checklist: - [X] I have added any new packages to the sonar-scanner.properties file - [X] My change requires a change to the documentation. - [X] I have updated the documentation accordingly. - [X] I have read the **CONTRIBUTING** document. [CARMA Contributing Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) - [X] I have added tests to cover my changes. - [X] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description PR to update our checkout, build and CI processes to not be coupled to a specific branch. This PR uses a new action defined in the PR (usdot-fhwa-stol/actions#34) which determines a Docker Hub organization and tag based on the GitHub event that triggers the action. Using this we are able to dynamically assign a base image for CI steps and for Dockerfile builds. Using other GitHub event data we are able to checkout current dependencies. <!--- Describe your changes in detail --> ## Related GitHub Issue <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key <!-- e.g. CAR-123 --> ## Motivation and Context Reduce tedious work for release <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? CI <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [x] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description <!--- Describe your changes in detail --> Added ARM asn1c shared object library, and updated the architecture check in the cmake file to also check for arm vs. x86. ## Related GitHub Issue <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key <!-- e.g. CAR-123 --> https://usdot-carma.atlassian.net/browse/CF-836 ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> Adding ARM and Humble compatability to carma-messenger, for the C1T project ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> Tested building on Humble/ARM, Humble/x86, and Foxy/x86. No actual functionality was tested. ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [x] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details Disable intermittently failing unit test in order to allow CI to complete on new PRs. This test seems to be failing at times due to time taken by the service calls being tested. ## Description This PR disables a unit test that is failing intermittently on CI.  <!--- Describe your changes in detail --> ## Related GitHub Issue usdot-fhwa-stol/carma-platform#2335 <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key [CAR-6044](https://usdot-carma.atlassian.net/browse/CAR-6044) <!-- e.g. CAR-123 --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. [CAR-6044]: https://usdot-carma.atlassian.net/browse/CAR-6044?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
# PR Details ## Description This PR removes the unused `truck_inspection_plugin`. ## Related Jira Key [CAR-6032](https://usdot-carma.atlassian.net/browse/CAR-6032) ## Motivation and Context The `truck_inspection_plugin` node in `carma-messenger` has remained unused for multiple years and is not a part of future planned work. Since its related node (truck_inspection_client in carma-platform) is still in ROS 1 Noetic, a decision has been made to remove both of them, rather than porting `truck_inspection_client` to ROS 2. ## How Has This Been Tested? 1. Launched CARMA messenger 2. Confirmed CARMA messenger does not crash 3. Confirmed the layout of the GUI is correct without the truck inspection plugin 4. Clicked around the GUI and broadcast traffic management messages successfully ## Types of changes - [x] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. [CAR-6032]: https://usdot-carma.atlassian.net/browse/CAR-6032?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
# PR Details ## Description This PR migrates the ROS Bridge used in the CARMA Messenger Web UI to the ROS2 version. Additional modifications were made to the Web UI to ensure that it now receives ROS2 messages. ## Related Jira Key [CAR-5924](https://usdot-carma.atlassian.net/browse/CAR-5924) ## Motivation and Context The rosbridge package (which enables communication between the UI and the ROS System) was upgraded from ROS 1 Noetic to ROS 2 Foxy for carma-platform, but was never upgraded for carma-messenger. The goal of this story is to complete that upgrade for carma-messenger. ## How Has This Been Tested? A local integration test was conducted to verify that the Web UI still functions as expected when launching CARMA Messenger. The docker containers were inspected to ensure that only the ROS2 version of the ROS bridge is launched and that messages published in ROS2 by the UI were received in the ROS1 container. ## Types of changes - [ ] Defect fix (non-breaking change that fixes an issue) - [x] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. [CAR-5924]: https://usdot-carma.atlassian.net/browse/CAR-5924?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description This PR supports migration of pinpoint driver to ROS2 in this PR: usdot-fhwa-stol/carma-torc-pinpoint-driver#46 - It adds ROS2 version of pinpoint to the configs - It adds commands to include .env file in the image which started to be convention on this PR: usdot-fhwa-stol/carma-config#352 <!--- Describe your changes in detail --> ## Related GitHub Issue NA <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key https://usdot-carma.atlassian.net/browse/CAR-5907 <!-- e.g. CAR-123 --> ## Motivation and Context Migration of pinpoint to ROS2 <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? Set the config and tried starting without issue. Just needs to test on actual Tahoe vehicle now. NOTE: image intentionally comments out the other components other than pinpoint  <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [X] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [X] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [X] I have updated the documentation accordingly. - [X] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [X] I have added tests to cover my changes. - [X] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description <!--- Describe your changes in detail --> Just noticed that the dockerhub build is failing because there is a typo in the github workflow file. ## Related GitHub Issue <!--- This project only accepts pull requests related to open GitHub issues or Jira Keys --> <!--- If suggesting a new feature or change, please discuss it in an issue first --> <!--- If fixing a bug, there should be an issue describing it with steps to reproduce --> <!--- Please DO NOT name partially fixed issues, instead open an issue specific to this fix --> <!--- Please link to the issue here: --> ## Related Jira Key <!-- e.g. CAR-123 --> ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Defect fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.
<!-- Thanks for the contribution, this is awesome. --> # PR Details ## Description This PR migrates the `traffic_incident` package to ROS2. ## Related GitHub Issue NA ## Related Jira Key [CAR-5920](https://usdot-carma.atlassian.net/browse/CAR-5920) ## Motivation and Context Migration to ROS2 ## How Has This Been Tested? 1. Set the config and launched using `carma start all` 2. Entered the `messenger_ros2` container using `docker exec -it messenger_ros2 bash` 3. Verified that `/traffic_incident` shows up when running `ros2 node list` 4. Verified that the state of `/traffic_incident` automatically switches to `active` using `ros2 lifecycle get /traffic_incident` 5. Open the CARMA Messenger GUI and started a traffic event broadcast in the event management plugin a. Verified that the correct message starts publishing on `/outgoing_mobility_operation` b. Verified that publishing stops after clicking "Stop Broadcast" ## Types of changes - [ ] Defect fix (non-breaking change that fixes an issue) - [x] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that cause existing functionality to change) ## Checklist: - [ ] I have added any new packages to the sonar-scanner.properties file - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [x] I have read the [**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) document. - [ ] I have added tests to cover my changes. - [x] All new and existing tests passed. [CAR-5920]: https://usdot-carma.atlassian.net/browse/CAR-5920?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
john-chrosniak
approved these changes
Sep 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Details
This PR is to merge release/omega branch into master branch for C1t release with new version.
Description
Related GitHub Issue
Related Jira Key
Motivation and Context
How Has This Been Tested?
Types of changes
Checklist: