commit fb6fd36a730e1287e2152827c12b1bbeb1101c5c
author Matthew Hart <matthew.hart@arm.com> Wed Mar 04 21:03:59 2020 +0000
committer Dean Birch <dean.birch@arm.com> Thu May 28 14:26:34 2020 +0100
tree 9066ebb95abfb3a4571498f16b388b06bd9a2db4
parent d0f9f8c4ef03a27104b97a3de9a8e9a252e8c657

Refactor the LAVA job generation

Create a LAVA job per test
Use flasher support
Simplify templates
Include metadata
Add LAVA job generation for each parallel build
Implement the LAVA wait and parsing step for simple gerrit verification
Create FVP jobs as well
Change filenames for MPS2 fvp jobs
Fix FVP templates and add NOBL2 jobs
User docker-prefix and license-variable from Jenkins job environment

Change-Id: I4dca28a353bc908a570f578b539aeb9c4528f6fa
Signed-off-by: Dean Birch <dean.birch@arm.com>

src/org/trustedfirmware/Gerrit.groovy

diff --git a/src/org/trustedfirmware/Gerrit.groovy b/src/org/trustedfirmware/Gerrit.groovy
index 7addf0d..732fe58 100644
--- a/src/org/trustedfirmware/Gerrit.groovy
+++ b/src/org/trustedfirmware/Gerrit.groovy
@@ -11,7 +11,7 @@
   node("docker-amd64-xenial") {
     cleanWs()
     dir("tf-m-ci-scripts") {
-      git url: '$CI_SCRIPTS_REPO', branch: 'master', credentialsId: 'GIT_SSH_KEY'
+      git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
     }
     verifyStatusInWorkspace(value, verify_name, category)
   }
@@ -38,7 +38,7 @@
   node("docker-amd64-xenial") {
     cleanWs()
     dir("tf-m-ci-scripts") {
-      git url: '$CI_SCRIPTS_REPO', branch: 'master', credentialsId: 'GIT_SSH_KEY'
+      git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
     }
     commentInWorkspace(comment)
   }

src/org/trustedfirmware/Summary.groovy

diff --git a/src/org/trustedfirmware/Summary.groovy b/src/org/trustedfirmware/Summary.groovy
index bb5b16d..ec46775 100644
--- a/src/org/trustedfirmware/Summary.groovy
+++ b/src/org/trustedfirmware/Summary.groovy
@@ -20,7 +20,12 @@
     } else {
       bl2_string = 'NOBL2'
     }
-    row_string = "${params['TARGET_PLATFORM']}_${params['COMPILER']}_${params['CMAKE_BUILD_TYPE']}_${bl2_string}"
+    if (params["PSA_API_SUITE"].isEmpty()) {
+      psa_string = ""
+    } else {
+      psa_string = "_${params['PSA_API_SUITE']}"
+    }
+    row_string = "${params['TARGET_PLATFORM']}_${params['COMPILER']}_${params['CMAKE_BUILD_TYPE']}_${bl2_string}${psa_string}"
     column_string = "${params['PROJ_CONFIG']}"
     row = table[row_string]
     if (row == null) {