commit aa6c48f090cdbcefa2cad466f0ec1e5bf28f540e
author Manish V Badarkhe <Manish.Badarkhe@arm.com> Wed Apr 09 14:03:26 2025 +0100
committer Lauren Wehrmeister <lauren.wehrmeister@arm.com> Thu Apr 10 21:19:50 2025 +0200
tree 8c01d0c6d3d57cfa0c259cea9e2f68e78bb90bf0
parent 7f8cbb9db22d60519fbbe2c089ea7b03a1b4bf5a

Add support for cloning the TF-RMM repository

Enhance the tf-a-ci-gateway job to include the capability to clone the TF-RMM repository.
Updated the clone script accordingly to handle this new addition.

Change-Id: I3dae9befbd686a8252b8f3bd7dd3e2b500dd022b
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>

scripts/clone.sh

diff --git a/scripts/clone.sh b/scripts/clone.sh
index 688c75b..9f802b9 100755
--- a/scripts/clone.sh
+++ b/scripts/clone.sh
@@ -43,6 +43,7 @@
 TF_M_EXTRAS_GERRIT_PROJECT="${TF_M_EXTRAS_GERRIT_PROJECT:-TF-M/tf-m-extras}"
 TFTF_GERRIT_PROJECT="${TFTF_GERRIT_PROJECT:-TF-A/tf-a-tests}"
 SPM_GERRIT_PROJECT="${SPM_GERRIT_PROJECT:-hafnium/hafnium}"
+RMM_GERRIT_PROJECT="${RMM_GERRIT_PROJECT:-TF-RMM/tf-rmm}"
 CI_GERRIT_PROJECT="${CI_GERRIT_PROJECT:-ci/tf-a-ci-scripts}"
 JOBS_PROJECT="${JOBS_PROJECT:-ci/tf-a-job-configs.git}"
 
@@ -50,6 +51,7 @@
 TF_GERRIT_REFSPEC="${TF_GERRIT_REFSPEC:-${REFSPEC_MASTER}}"
 TFTF_GERRIT_REFSPEC="${TFTF_GERRIT_REFSPEC:-${REFSPEC_MASTER}}"
 SPM_REFSPEC="${SPM_REFSPEC:-${REFSPEC_MASTER}}"
+RMM_REFSPEC="${RMM_REFSPEC:-${REFSPEC_MASTER}}"
 TF_M_TESTS_GERRIT_REFSPEC="${TF_M_TESTS_GERRIT_REFSPEC:-${REFSPEC_TF_M_TESTS}}"
 TF_M_EXTRAS_GERRIT_REFSPEC="${TF_M_EXTRAS_GERRIT_REFSPEC:-${REFSPEC_TF_M_EXTRAS}}"
 CI_REFSPEC="${CI_REFSPEC:-${REFSPEC_MASTER}}"
@@ -63,6 +65,7 @@
     "${GERRIT_HOST};${TF_GERRIT_PROJECT};trusted-firmware-a;${TF_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${TFTF_GERRIT_PROJECT};tf-a-tests;${TFTF_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${SPM_GERRIT_PROJECT};spm;${SPM_REFSPEC}"
+    "${GERRIT_HOST};${RMM_GERRIT_PROJECT};tf-rmm;${RMM_REFSPEC}"
     "${GERRIT_HOST};${TF_M_TESTS_GERRIT_PROJECT};tf-m-tests;${TF_M_TESTS_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${TF_M_EXTRAS_GERRIT_PROJECT};tf-m-extras;${TF_M_EXTRAS_GERRIT_REFSPEC}"
 )

tf-a-builder/builders.sh

diff --git a/tf-a-builder/builders.sh b/tf-a-builder/builders.sh
index be8426d..a591bf8 100755
--- a/tf-a-builder/builders.sh
+++ b/tf-a-builder/builders.sh
@@ -122,6 +122,7 @@
 export tf_root="${tf_root:-${WORKSPACE}/trusted-firmware-a}"
 export tftf_root="${tftf_root:-${WORKSPACE}/tf-a-tests}"
 export spm_root="${spm_root:-${WORKSPACE}/spm}"
+export rmm_root="${rmm_root:-${WORKSPACE}/tf-rmm}"
 
 # We'd need to see the terminals during development runs, so no need for
 # automation.

tf-a-ci-gateway.yaml

diff --git a/tf-a-ci-gateway.yaml b/tf-a-ci-gateway.yaml
index faa1134..15b14f0 100644
--- a/tf-a-ci-gateway.yaml
+++ b/tf-a-ci-gateway.yaml
@@ -66,6 +66,11 @@
         description: |
           tf-a-ci-scripts refspec to use. The master branch is used by default.
     - string:
+        name: RMM_REFSPEC
+        default: '+refs/heads/main:refs/remotes/origin/main'
+        description: |
+          tf-rmm refspec to use. The main branch is used by default.
+    - string:
         name: JOBS_REFSPEC
         default: 'refs/heads/master'
         description: |