commit 94abc04b9cea37c5838dc1eb335901ae056571c3
author Leonardo Sandoval <leonardo.sandoval@linaro.org> Mon Mar 29 19:32:39 2021 -0600
committer Sandrine Bailleux <sandrine.bailleux@arm.com> Wed Mar 31 08:13:33 2021 +0200
tree 56c9db20cbb7eb2481b32d4b35e6450af0720c14
parent 5a3356677976ecab85504214f387802115ee3e0d

pick gerrit choosing-strategy as scm checkout strategy

Currently, Open CI checkouts a branch, either integration or master,
instead of user's MR refspec (GERRIT_REFSPEC), effectively not
testing users patches. This change indicates the scm plugin to use
gerrit as choosing strategy, which indicates the way it checkouts,
taking into consideration user's patch.

Also, a minor patch does a fix on the tf-a-tests repo, pointing to
review.trustedfirmware.org instead of git.trustedfirmware.org, the
former is the right repository to checkout gerrit refspecs.

Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: Iacf880f13fa76db473ef49c6de772404933a7406

tf-a-builder.yaml

diff --git a/tf-a-builder.yaml b/tf-a-builder.yaml
index 1b795b7..95f72a0 100644
--- a/tf-a-builder.yaml
+++ b/tf-a-builder.yaml
@@ -21,6 +21,7 @@
             branches:
                 - ${TF_GERRIT_BRANCH}
             basedir: trusted-firmware-a
+            choosing-strategy: gerrit
             skip-tag: true
             shallow-clone: false
             wipe-workspace: false
@@ -28,12 +29,13 @@
     name: tf-a-tests
     scm:
         - git:
-            url: https://git.trustedfirmware.org/${TFTF_GERRIT_PROJECT}
+            url: https://review.trustedfirmware.org/${TFTF_GERRIT_PROJECT}
             refspec: ${TFTF_GERRIT_REFSPEC}
             name: origin
             branches:
                 - ${TFTF_GERRIT_BRANCH}
             basedir: tf-a-tests
+            choosing-strategy: gerrit
             skip-tag: true
             shallow-clone: false
             wipe-workspace: false

tf-coverity.yaml

diff --git a/tf-coverity.yaml b/tf-coverity.yaml
index 468f03b..03d308d 100644
--- a/tf-coverity.yaml
+++ b/tf-coverity.yaml
@@ -21,6 +21,7 @@
             branches:
                 - ${TF_GERRIT_BRANCH}
             basedir: trusted-firmware-a
+            choosing-strategy: gerrit
             skip-tag: true
             shallow-clone: false
             wipe-workspace: false

tf-main.yaml

diff --git a/tf-main.yaml b/tf-main.yaml
index 02082e6..bc14916 100644
--- a/tf-main.yaml
+++ b/tf-main.yaml
@@ -21,6 +21,7 @@
             branches:
                 - ${TF_GERRIT_BRANCH}
             basedir: trusted-firmware-a
+            choosing-strategy: gerrit
             skip-tag: true
             shallow-clone: false
             wipe-workspace: false

tf-static-checks.yaml

diff --git a/tf-static-checks.yaml b/tf-static-checks.yaml
index 2f01de7..81ab262 100644
--- a/tf-static-checks.yaml
+++ b/tf-static-checks.yaml
@@ -21,6 +21,7 @@
             branches:
                 - ${TF_GERRIT_BRANCH}
             basedir: trusted-firmware-a
+            choosing-strategy: gerrit
             skip-tag: true
             shallow-clone: false
             wipe-workspace: false
@@ -34,6 +35,7 @@
             branches:
                 - ${TFTF_GERRIT_BRANCH}
             basedir: tf-a-tests
+            choosing-strategy: gerrit
             skip-tag: true
             shallow-clone: false
             wipe-workspace: false