commit 239450c470589915c1a4c2e0d7364c3825b51836
author Leonardo Sandoval <leonardo.sandoval@linaro.org> Mon Jan 11 17:51:12 2021 -0600
committer Zelalem Aweke <zelalem.aweke@arm.com> Wed Jan 13 19:47:49 2021 +0000
tree 79b46962725d57ac6223ef41db8a2a83e56d8a1f
parent 0a9d54737e6d088a73d4bb024ac74eccdd9513eb

use Arm's jenkins environment check function

Use the function that checks Arm's jenkins environment instead of 'echo
| grep' pipe command

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

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index 1101d94..a366909 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -264,8 +264,10 @@
     # feature, so for the moment avoid creating any LAVA test job definition
     # for this model until a solution is found.
     # [1] https://tf.validation.linaro.org/scheduler/job/33871
-    if echo "$JENKINS_URL" | grep -q -v "arm.com" && [ "${model}" = "foundationv8" ]; then
-        return
+    if ! is_arm_jenkins_env; then
+     if [ "${model}" = "foundationv8" ]; then
+         return
+     fi
     fi
 
     # optional parameters, defaults to globals

model/fvp_common.sh

diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index 2f9cd17..ef29c3b 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -82,7 +82,7 @@
 
 EOF
 
-if echo "$JENKINS_URL" | grep -q -v "arm.com"; then
+if ! is_arm_jenkins_env; then
 	cat <<EOF >>"$model_param_file"
 -C bp.pl011_uart0.untimed_fifos=1
 -C bp.pl011_uart1.untimed_fifos=1