commit c7ad0829693d66e26a051b79882ac2abd5ed3336
author Xinyu Zhang <xinyu.zhang@arm.com> Wed Nov 23 17:54:26 2022 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Wed Nov 23 17:54:26 2022 +0800
tree 3835012ca2ca30231e197742c84b76a026549d5d
parent 775afe3df4f928d61e6b7b6682487d0f31b328a3

Build: Clone QCBOR to workspace and use local path

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

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 1a07825..9b611ee 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -60,6 +60,7 @@
         "-DMBEDCRYPTO_PATH=%(codebase_root_dir)s/../mbedtls " + \
         "-DPSA_ARCH_TESTS_PATH=%(codebase_root_dir)s/../psa-arch-tests " + \
         "-DMCUBOOT_PATH=%(codebase_root_dir)s/../mcuboot " + \
+        "-DQCBOR_PATH=%(codebase_root_dir)s/../QCBOR " + \
         "%(codebase_root_dir)s",
 
     "set_compiler_path": "export PATH=$PATH:$%(compiler)s_PATH",

clone.sh

diff --git a/clone.sh b/clone.sh
index b107bb7..11279e2 100755
--- a/clone.sh
+++ b/clone.sh
@@ -66,9 +66,9 @@
 PSA_ARCH_TESTS_REFSPEC="${PSA_ARCH_TESTS_VERSION:-}"
 PSA_ARCH_TESTS_NAME="psa-arch-tests"
 
-PSA_QCBOR_PROJECT="https://github.com/laurencelundblade/QCBOR.git"
-PSA_QCBOR_REFSPEC="refs/heads/master"
-PSA_QCBOR_NAME="psa_qcbor"
+QCBOR_PROJECT="${QCBOR_URL:-}"
+QCBOR_REFSPEC="${QCBOR_VERSION:-}"
+QCBOR_NAME="QCBOR"
 
 # Array containing "<repo url>;"<repo name>;<refspec>" elements
 repos=(
@@ -78,7 +78,7 @@
     "${MBEDTLS_PROJECT};${MBEDTLS_NAME};${MBEDTLS_REFSPEC}"
     "${MCUBOOT_PROJECT};${MCUBOOT_NAME};${MCUBOOT_REFSPEC}"
     "${PSA_ARCH_TESTS_PROJECT};${PSA_ARCH_TESTS_NAME};${PSA_ARCH_TESTS_REFSPEC}"
-    "${PSA_QCBOR_PROJECT};${PSA_QCBOR_NAME};${PSA_QCBOR_REFSPEC}"
+    "${QCBOR_PROJECT};${QCBOR_NAME};${QCBOR_REFSPEC}"
     "${TFM_EXTRAS_PROJECT};${TFM_EXTRAS_NAME};${TFM_EXTRAS_REFSPEC}"
     "${FREERTOS_KERNEL_PROJECT};${FREERTOS_KERNEL_NAME};${FREERTOS_KERNEL_REFSPEC}"
     "https://review.trustedfirmware.org/ci/qa-tools;qa-tools;openci"

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 5557a08..c4e0551 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -96,6 +96,8 @@
   params += string(name: 'TFM_TESTS_URL', value: env.TFM_TESTS_URL)
   params += string(name: 'PSA_ARCH_TESTS_VERSION', value: env.PSA_ARCH_TESTS_VERSION)
   params += string(name: 'PSA_ARCH_TESTS_URL', value: env.PSA_ARCH_TESTS_URL)
+  params += string(name: 'QCBOR_VERSION', value: env.QCBOR_VERSION)
+  params += string(name: 'QCBOR_URL', value: env.QCBOR_URL)
   params += string(name: 'FREERTOS_KERNEL_REFSPEC', value: env.FREERTOS_KERNEL_REFSPEC)
   params += string(name: 'FREERTOS_KERNEL_URL', value: env.FREERTOS_KERNEL_URL)
   params += string(name: 'SHARE_FOLDER', value: env.SHARE_FOLDER)