From 3cc38381a193ba91716837adc608830a567d473e Mon Sep 17 00:00:00 2001
From: Francisco Gallego Salido <fgallego@rti.com>
Date: Fri, 26 Jun 2026 12:41:26 +0200
Subject: [PATCH 1/2] Don't ignore rmw_connextdds by default in linux-aarch64

---
 job_templates/ci_launcher_job.xml.em | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/job_templates/ci_launcher_job.xml.em b/job_templates/ci_launcher_job.xml.em
index 0131d51e..39185953 100644
--- a/job_templates/ci_launcher_job.xml.em
+++ b/job_templates/ci_launcher_job.xml.em
@@ -3,7 +3,6 @@
   <actions/>
   <description>
     Launches a build of the CI job for each supported platform with the same set of parameters.
-    Use of RTI Connext will always be disabled on aarch64 jobs.
   </description>
   <keepDependencies>false</keepDependencies>
   <properties>
@@ -99,16 +98,6 @@ for (item in predicted_jobs) {
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
           <configs>
             <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
-@[  if os_name in ['linux-aarch64']]@
-            <hudson.plugins.parameterizedtrigger.BooleanParameters>
-              <configs>
-                <hudson.plugins.parameterizedtrigger.BooleanParameterConfig>
-                  <name>CI_USE_CONNEXTDDS</name>
-                  <value>false</value>
-                </hudson.plugins.parameterizedtrigger.BooleanParameterConfig>
-              </configs>
-            </hudson.plugins.parameterizedtrigger.BooleanParameters>
-@[  end if]@
 @[  if os_name in ['windows', 'windows-2025']]@
             <hudson.plugins.parameterizedtrigger.BooleanParameters>
               <configs>

From 6c82ce1dab0602fbd295ecc3e55071cfb375de8a Mon Sep 17 00:00:00 2001
From: Francisco Gallego Salido <fgallego@rti.com>
Date: Tue, 8 Sep 2026 13:34:18 +0200
Subject: [PATCH 2/2] Make sure we force the use of Connext Debians in
 linux-aarch64

---
 job_templates/ci_launcher_job.xml.em | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/job_templates/ci_launcher_job.xml.em b/job_templates/ci_launcher_job.xml.em
index 356841e1..7e71b5f6 100644
--- a/job_templates/ci_launcher_job.xml.em
+++ b/job_templates/ci_launcher_job.xml.em
@@ -107,6 +107,16 @@ for (item in predicted_jobs) {
                 </hudson.plugins.parameterizedtrigger.BooleanParameterConfig>
               </configs>
             </hudson.plugins.parameterizedtrigger.BooleanParameters>
+@[  end if]@
+@[  if os_data['use_connext_debs_default'] == 'true']@
+            <hudson.plugins.parameterizedtrigger.BooleanParameters>
+              <configs>
+                <hudson.plugins.parameterizedtrigger.BooleanParameterConfig>
+                  <name>CI_USE_CONNEXT_DEBS</name>
+                  <value>@(os_data['use_connext_debs_default'])</value>
+                </hudson.plugins.parameterizedtrigger.BooleanParameterConfig>
+              </configs>
+            </hudson.plugins.parameterizedtrigger.BooleanParameters>
 @[  end if]@
           </configs>
           <projects>@(os_data['job_name'])</projects>