Add RHEL10 image to WSO2 integration test configuration #1538
Conversation
WalkthroughA CloudFormation template was updated to include a new mapping entry for RHEL10 operating system with AMI ID ami-0ad50334604831820 under the existing OperatingSystemAMI mapping section. Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Pull request overview
Adds RHEL 10 support to the WSO2 update2 integration test CloudFormation template by introducing an AMI mapping entry.
Changes:
- Added a new
RHEL10entry under theOperatingSystemAMImapping with AMIami-0ad50334604831820.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| img: ami-077a8c9eeb949d9d6 | ||
| RHEL9: | ||
| img: ami-07aa0998b75b559e0 | ||
| RHEL10: | ||
| img: ami-0ad50334604831820 |
There was a problem hiding this comment.
Adding the RHEL10 AMI mapping is not sufficient on its own: the template’s OS gating/bootstrapping logic does not recognize "RHEL10" yet. In particular, the IsUnix condition currently excludes RHEL10, so choosing OperatingSystem=RHEL10 would prevent WSO2UnixInstance from being created (and the UserData branches that handle RHEL8/RHEL9/Rocky won’t run for RHEL10 either). Update the IsUnix condition and the relevant UserData OS checks to include RHEL10 (likely alongside the existing RHEL9/Rocky paths).
There was a problem hiding this comment.
This is not needed as this will be passed as a parameter
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@jobs/intg-test-resources/update2-releases/wso2-u2-intg-test-cfn.yaml`:
- Around line 218-219: RHEL10 is added to the AMI map but not included in the OS
condition and bootstrap branches; update the CloudFormation template so the
"RHEL10" key is treated like "RHEL9": add "RHEL10" into the IsUnix condition (or
create an explicit IsRHEL10 condition) and include it in the same UserData and
cfn-signal branches that run RHEL9 bootstrap steps (or add a parallel RHEL10
UserData/cfn-signal branch), ensuring instances with OperatingSystem=RHEL10
evaluate IsUnix true and execute the same bootstrap and cfn-signal actions.
| RHEL10: | ||
| img: ami-0ad50334604831820 |
There was a problem hiding this comment.
Add RHEL10 to OS conditions and UserData branches.
RHEL10 is mapped, but it isn’t included in IsUnix or any of the OS-specific UserData/cfn-signal branches. Selecting OperatingSystem=RHEL10 will result in no instance being created and missing bootstrap steps. Please wire RHEL10 into the same paths as RHEL9 (or an explicit RHEL10 branch if needed).
🔧 Suggested updates
Conditions:
IsWindows: !Equals [ !Ref OperatingSystem, "Windows" ]
- IsUnix: !Or [ !Equals [ !Ref OperatingSystem, "CentOS"], !Equals [ !Ref OperatingSystem, "Ubuntu" ], !Equals [ !Ref OperatingSystem, "RHEL8" ], !Equals [ !Ref OperatingSystem, "RHEL9" ], !Equals [ !Ref OperatingSystem, "SUSE" ], !Equals [ !Ref OperatingSystem, "Rocky" ]]
+ IsUnix: !Or [ !Equals [ !Ref OperatingSystem, "CentOS"], !Equals [ !Ref OperatingSystem, "Ubuntu" ], !Equals [ !Ref OperatingSystem, "RHEL8" ], !Equals [ !Ref OperatingSystem, "RHEL9" ], !Equals [ !Ref OperatingSystem, "RHEL10" ], !Equals [ !Ref OperatingSystem, "SUSE" ], !Equals [ !Ref OperatingSystem, "Rocky" ]]
- if [[ ${OperatingSystem} == "CentOS" ]] || [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
+ if [[ ${OperatingSystem} == "CentOS" ]] || [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "RHEL10" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
...
- if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "Rocky" ]] ; then
+ if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "RHEL10" ]] || [[ ${OperatingSystem} == "Rocky" ]] ; then
...
- if [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
+ if [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "RHEL10" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
...
- if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "CentOS" ]] || [[ ${OperatingSystem} == "SUSE" ]]; then
+ if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL10" ]] || [[ ${OperatingSystem} == "CentOS" ]] || [[ ${OperatingSystem} == "SUSE" ]]; then
...
- if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "SUSE" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
+ if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "RHEL10" ]] || [[ ${OperatingSystem} == "SUSE" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
...
- if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then
+ if [[ ${OperatingSystem} == "RHEL8" ]] || [[ ${OperatingSystem} == "RHEL9" ]] || [[ ${OperatingSystem} == "RHEL10" ]] || [[ ${OperatingSystem} == "Rocky" ]]; then🤖 Prompt for AI Agents
In `@jobs/intg-test-resources/update2-releases/wso2-u2-intg-test-cfn.yaml` around
lines 218 - 219, RHEL10 is added to the AMI map but not included in the OS
condition and bootstrap branches; update the CloudFormation template so the
"RHEL10" key is treated like "RHEL9": add "RHEL10" into the IsUnix condition (or
create an explicit IsRHEL10 condition) and include it in the same UserData and
cfn-signal branches that run RHEL9 bootstrap steps (or add a parallel RHEL10
UserData/cfn-signal branch), ensuring instances with OperatingSystem=RHEL10
evaluate IsUnix true and execute the same bootstrap and cfn-signal actions.
There was a problem hiding this comment.
This is not needed as this will be passed as a parameter
There was a problem hiding this comment.
@AnuGayan, I understand that OperatingSystem is passed as a parameter, but the concern is about how that parameter value is used within the template logic.
Here's the technical issue:
-
CloudFormation condition: The
IsUnixcondition (around line 220) explicitly checks for specific OS values. If someone passesOperatingSystem=RHEL10, the condition evaluates to false becauseRHEL10isn't in the list. This meansWSO2UnixInstance(which hasCondition: 'IsUnix') won't be created at all. -
UserData script logic: The bash script has multiple OS-specific branches (e.g., installing packages, setting up cfn-signal). If
RHEL10isn't included in these conditionals, those installation steps won't execute for RHEL10 instances.
While the parameter allows users to specify RHEL10, the template currently doesn't have the logic to handle that value. You might want to verify this works as expected with the current structure, or consider adding RHEL10 to the relevant conditions and script branches similar to how RHEL9 is handled.
Let me know if you'd like me to search for more information about RHEL10-specific requirements or if you've tested this configuration!
This pull request introduces a minor update to the CloudFormation template by adding support for RHEL 10. The change consists of including the appropriate AMI mapping for the new RHEL 10 image.
RHEL10with its corresponding AMI (ami-0ad50334604831820) in theMappingssection ofjobs/intg-test-resources/update2-releases/wso2-u2-intg-test-cfn.yaml.Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.