Add more LAVA fvp tests, fix regex and sanitise job timeouts

Add more FVP test jobs to increase code coverage

I had taken the old LAVA tests from MPS2 and as it is trying to match colour codes, it meant some different coloured tests were being missed. Remove the colour codes from the regex.

Shorten the MPS2 job timeouts as the jobs are much shorter, and increase the FVP timeouts as some of the regression tests take a bit longer than expected.

Change-Id: I528a261593ee5b15019b8ee44269cf3ce07e1177
diff --git a/jenkins/lava-submit.jpl b/jenkins/lava-submit.jpl
index 73d5b78..4be24b5 100644
--- a/jenkins/lava-submit.jpl
+++ b/jenkins/lava-submit.jpl
@@ -17,14 +17,19 @@
     withCredentials([usernamePassword(credentialsId: 'LAVA_CREDENTIALS', passwordVariable: 'LAVA_TOKEN', usernameVariable: 'LAVA_USER')]) {
       print("Generating LAVA jobs...")
       def bl2_string = ""
+      def psa_string = ""
       if (env.BL2.equals("True")) {
         bl2_string = "--bl2"
       }
+      // work around this string containing quotes?
+      if (!env.PSA_API_SUITE.replace('\'', '').isEmpty()) {
+        psa_string = "--psa-api-suite ${env.PSA_API_SUITE}"
+      }
       dir("tf-m-ci-scripts") {
         def res = sh(script: """./lava_helper/lava_create_jobs.py \
 --build-number ${env.BUILD_NUMBER} --output-dir lava_jobs \
 --compiler ${env.COMPILER} --platform ${env.TARGET_PLATFORM} \
-${bl2_string} --build-type ${env.CMAKE_BUILD_TYPE} \
+${bl2_string} ${psa_string} --build-type ${env.CMAKE_BUILD_TYPE} \
 --jenkins-build-url ${env.BUILD_URL} --proj-config ${env.PROJ_CONFIG} \
 --docker-prefix ${env.DOCKER_PREFIX} --license-variable "${env.LICENSE_VARIABLE}"
 """, returnStdout: true).trim()