commit 8715750ddfdae988fa50597b14d8679113639893
author xinyu-tfm <xinyu.zhang@arm.com> Mon Aug 24 17:43:03 2020 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Wed Aug 26 09:35:54 2020 +0000
tree 9e3604c5d04a4b2e2abf361c08ce8884d78d8e66
parent 02d30352798eca211bc6287b1cb6b527477ecbfa

Remove CMSIS from TF-M CI scripts

TF-M has added tfm-test as a dependency.

Thus CMSIS could be removed.

Change-Id: I2164bcf7439672d9333162c0dee06bbbbb18a234
Signed-off-by: xinyu-tfm <xinyu.zhang@arm.com>

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 8b9fcb9..794c9e9 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -45,7 +45,6 @@
   params += string(name: 'GERRIT_CHANGE_NUMBER', value: env.GERRIT_CHANGE_NUMBER)
   params += string(name: 'GERRIT_PATCHSET_REVISION', value: env.GERRIT_PATCHSET_REVISION)
   params += string(name: 'GERRIT_REFSPEC', value: env.GERRIT_REFSPEC)
-  params += string(name: 'CMSIS_VERSION', value: env.CMSIS_VERSION)
   params += string(name: 'MBEDCRYPTO_VERSION', value: env.MBEDCRYPTO_VERSION)
   params += string(name: 'MBEDTLS_VERSION', value: env.MBEDTLS_VERSION)
   params += string(name: 'CODE_REPO', value: env.CODE_REPO)
@@ -85,7 +84,6 @@
   params += string(name: 'GERRIT_CHANGE_NUMBER', value: env.GERRIT_CHANGE_NUMBER)
   params += string(name: 'GERRIT_PATCHSET_REVISION', value: env.GERRIT_PATCHSET_REVISION)
   params += string(name: 'GERRIT_REFSPEC', value: env.GERRIT_REFSPEC)
-  params += string(name: 'CMSIS_VERSION', value: env.CMSIS_VERSION)
   params += string(name: 'MBEDCRYPTO_VERSION', value: env.MBEDCRYPTO_VERSION)
   params += string(name: 'MBEDTLS_VERSION', value: env.MBEDTLS_VERSION)
   params += string(name: 'CODE_REPO', value: env.CODE_REPO)

jenkins/static.jpl

diff --git a/jenkins/static.jpl b/jenkins/static.jpl
index 6ada310..7598394 100644
--- a/jenkins/static.jpl
+++ b/jenkins/static.jpl
@@ -15,7 +15,6 @@
     params += string(name: 'GERRIT_REFSPEC', value: env.GERRIT_REFSPEC ?: '')
     params += string(name: 'GERRIT_CHANGE_NUMBER', value: env.GERRIT_CHANGE_NUMBER ?: '')
     params += string(name: 'GERRIT_PATCHSET_REVISION', value: env.GERRIT_PATCHSET_REVISION ?: '')
-    params += string(name: 'CMSIS_VERSION', value: env.CMSIS_VERSION)
     params += string(name: 'MBEDCRYPTO_VERSION', value: env.MBEDCRYPTO_VERSION)
     params += string(name: 'MBEDTLS_VERSION', value: env.MBEDTLS_VERSION)
     params += string(name: 'CODE_REPO', value: env.CODE_REPO)

tfm_ci_pylib/tfm_builder.py

diff --git a/tfm_ci_pylib/tfm_builder.py b/tfm_ci_pylib/tfm_builder.py
index 2125727..fbfa0c8 100644
--- a/tfm_ci_pylib/tfm_builder.py
+++ b/tfm_ci_pylib/tfm_builder.py
@@ -219,20 +219,6 @@
             raise Exception("Build Failed please check log: %s" %
                             self._tfb_log_f)
 
-
-        cp_cmd = "mkdir -p " + self._tfb_build_dir + "/CMSIS_5/CMSIS ; "
-        cp_cmd += "cp -r " + self._tfb_cfg["codebase_root_dir"] + "/../CMSIS_5/CMSIS/RTOS2 " + \
-                self._tfb_build_dir + "/CMSIS_5/CMSIS"
-
-        if subprocess_log(cp_cmd,
-                          self._tfb_log_f,
-                          append=True,
-                          prefix=cp_cmd,
-                          silent=self._tfb_silent):
-
-            raise Exception("Build Failed please check log: %s" %
-                            self._tfb_log_f)
-
         self._tfb_cfg["build_cmds"][0] = \
             self._tfb_cfg["build_cmds"][0].replace(self._tfb_cfg["codebase_root_dir"],
             self._tfb_build_dir + "/tf-m")