Build: Move ArmClang UBL license activation to a script file
To perform more advanced processing as needed.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I0e6a1a9bd98cb40fb021578c901969cde18817a6
diff --git a/jenkins/armclang-ubl.sh b/jenkins/armclang-ubl.sh
new file mode 100755
index 0000000..10efa8f
--- /dev/null
+++ b/jenkins/armclang-ubl.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Copyright (c) 2019, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Script to activate ArmClang UBL license.
+
+set -ex
+
+varname=${COMPILER}_PATH
+eval COMP_PATH=\$$varname
+
+${COMP_PATH}/armlm activate --code ${ARMCLANG_UBL_CODE}
+${COMP_PATH}/armlm inspect
diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index 065dc3e..bc2e271 100644
--- a/jenkins/build-config.jpl
+++ b/jenkins/build-config.jpl
@@ -34,7 +34,7 @@
// Activate UBL license for ArmClang.
if (env.CONFIG_NAME.contains("ARMCLANG")) {
withCredentials([string(credentialsId: 'ARMCLANG_UBL_CODE', variable: 'ARMCLANG_UBL_CODE')]) {
- sh(script: 'varname=${COMPILER}_PATH; eval COMP_PATH=\\$$varname; ${COMP_PATH}/armlm activate --code ${ARMCLANG_UBL_CODE}; ${COMP_PATH}/armlm inspect')
+ sh "tf-m-ci-scripts/jenkins/armclang-ubl.sh"
}
}