commit 8ea4cfc13c45ce3e9a4dc5ff882769595419a97f
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Oct 30 18:28:43 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Fri Nov 03 15:40:19 2023 +0800
tree aa051c6eed9119ee42521b229d2260e8835780ac
parent a73e677cdf4a6963fe7d845bc696cf26f64a6315

Build: Do not generate NSPE CMake commands for NSOFF configs

When TF-M config disables NS applications, NSPE CMake commands should
not be generated and run in CI job.

Also, when NSPE build is skipped, build folder "nspe" should not be
archived.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I35b2394c4cce1245d30bcdb7c03c6afd289f648e

jenkins/build-config.jpl

diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index 8d6df40..7450ff3 100644
--- a/jenkins/build-config.jpl
+++ b/jenkins/build-config.jpl
@@ -35,10 +35,18 @@
       }
       stage("Post") {
         archiveArtifacts 'ci_build/spe/bin/**'
-        archiveArtifacts 'ci_build/nspe/bin/**'
-        archiveArtifacts 'ci_build/nspe/*.bin'
         archiveArtifacts 'ci_build/spe/api_ns/bin/**'
         archiveArtifacts 'ci_build/spe/api_ns/interface/**'
+        try {
+          archiveArtifacts 'ci_build/nspe/bin/**'
+        } catch (Exception e) {
+          print("ci_build/nspe/bin not exists")
+        }
+        try {
+          archiveArtifacts 'ci_build/nspe/*.bin'
+        } catch (Exception e) {
+          print("ci_build/nspe/*.bin not exists")
+        }
         def upstreamProject = getUpstreamJob()[0].upstreamProject
         if (upstreamProject == "tf-m-build-and-test") {
           archiveArtifacts 'ci_build/spe/build-spe/generated/**'