commit 21a5e6751605749b5a1c6fa950985073776100c1
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Mon Mar 08 17:49:45 2021 -0600
committer Madhukar Pappireddy <madhukar.pappireddy@arm.com> Tue Mar 09 11:57:42 2021 -0600
tree da35862246fc838383da87e87724f6c68f6230ea
parent 4e5bf3b12992d2064bf30b9579a96dbb0ed8c5fd

Bug fix for local CI runs

There are three possible runtime enviroments supported by CI scripts:
1. Arm Jenkins
2. OpenCI
3. Local CI

Local CI, in many cases, resembles Arm Jenkins enviroment. This patch
fixes various conditions that effect choice of resources such as paths
of FVP Models etc.

For example, local CI run is picking up the Base_AEM model path as
/opt/model/Base_RevC_AEMv8A_pkg/models/Linux64_GCC-6.4
instead of
/arm/warehouse/SysGen/Models/11.12/38/models/Linux64_GCC-6.4/

Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Change-Id: Ic1a51ad15868ff9023144ff393e6f964151fcea0

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index 79a7286..dc785aa 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -328,7 +328,7 @@
     # 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 ! is_arm_jenkins_env; then
+    if ! is_arm_jenkins_env && not_upon "$local_ci"; then
      if [ "${model}" = "foundationv8" ]; then
          return
      fi

model/base-aemv8a.sh

diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 2c4de1d..fca5119 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -6,7 +6,7 @@
 #
 
 # Use revc model
-if  is_arm_jenkins_env; then
+if  is_arm_jenkins_env || upon "$local_ci"; then
         set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_RevC-2xAEMv8A"
         default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
 else

model/fvp_common.sh

diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index ef29c3b..f1e126a 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -82,7 +82,7 @@
 
 EOF
 
-if ! is_arm_jenkins_env; then
+if ! is_arm_jenkins_env && not_upon "$local_ci"; then
 	cat <<EOF >>"$model_param_file"
 -C bp.pl011_uart0.untimed_fifos=1
 -C bp.pl011_uart1.untimed_fifos=1

script/tf-coverity/common-def.sh

diff --git a/script/tf-coverity/common-def.sh b/script/tf-coverity/common-def.sh
index 94644e1..a7ec236 100644
--- a/script/tf-coverity/common-def.sh
+++ b/script/tf-coverity/common-def.sh
@@ -50,7 +50,7 @@
     local cross_compile_path="/home/buildslave/tools"
 
     # if under arm enviroment, overide cross-compilation path
-    is_arm_jenkins_env && cross_compile_path="/arm/pdsw/tools"
+    is_arm_jenkins_env || upon "$local_ci" && cross_compile_path="/arm/pdsw/tools"
 
     echo "${cross_compile_path}/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
 }
@@ -60,7 +60,7 @@
     local armclang_path="/home/buildslave/tools/armclang-6.8/bin"
 
     # if under arm enviroment, overide cross-compilation path
-    is_arm_jenkins_env && armclang_path="/arm/warehouse/Distributions/FA/ARMCompiler/6.8/25/standalone-linux-x86_64-rel/bin"
+    is_arm_jenkins_env || upon "$local_ci" && armclang_path="/arm/warehouse/Distributions/FA/ARMCompiler/6.8/25/standalone-linux-x86_64-rel/bin"
 
     echo "${armclang_path}/armclang"
 }

utils.sh

diff --git a/utils.sh b/utils.sh
index a145da3..5d3d6e0 100644
--- a/utils.sh
+++ b/utils.sh
@@ -281,7 +281,7 @@
     local cross_compile_path="/home/buildslave/tools"
 
     # if under arm enviroment, overide cross-compilation path
-    is_arm_jenkins_env && cross_compile_path="/arm/pdsw/tools"
+    is_arm_jenkins_env || upon "$local_ci" && cross_compile_path="/arm/pdsw/tools"
 
     echo "${cross_compile_path}/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
 }