commit 02d30352798eca211bc6287b1cb6b527477ecbfa
author Karl Zhang <karl.zhang@arm.com> Thu Aug 20 13:48:52 2020 +0800
committer Karl Zhang <karl.zhang@arm.com> Thu Aug 20 14:04:12 2020 +0800
tree 19d99f3336ea467b23090997ab132cea740a1bc5
parent c6bbbf943f490f14af92af15978aef0307e8238b

Add mbedtls as dependency in CI scripts

The mbedtls will active instead of mbed crypto.

Co-authored-by: Soby Mathew <soby.mathew@arm.com>
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Signed-off-by: Karl Zhang <karl.zhang@arm.com>
Change-Id: I8cdee611c14de6ae0a2a9a99e8efebc0777d91a8

jenkins/build-config.jpl

diff --git a/jenkins/build-config.jpl b/jenkins/build-config.jpl
index b84d286..5d72ed1 100644
--- a/jenkins/build-config.jpl
+++ b/jenkins/build-config.jpl
@@ -47,6 +47,20 @@
         ]
       )
     }
+    dir("mbedtls") {
+      checkout(
+        changelog: false,
+        poll: false,
+        scm: [
+          $class: 'GitSCM',
+          branches: [[name: 'FETCH_HEAD']],
+          userRemoteConfigs: [[
+            refspec: 'refs/tags/$MBEDTLS_VERSION',
+            url: params.MBEDTLS_URL
+          ]]
+        ]
+      )
+    }
     dir("mcuboot") {
       checkout(
         changelog: false,

jenkins/build-docs.jpl

diff --git a/jenkins/build-docs.jpl b/jenkins/build-docs.jpl
index a0f9072..29dbc5c 100644
--- a/jenkins/build-docs.jpl
+++ b/jenkins/build-docs.jpl
@@ -42,6 +42,20 @@
         ]
       )
     }
+    dir("mbedtls") {
+      checkout(
+        changelog: false,
+        poll: false,
+        scm: [
+          $class: 'GitSCM',
+          branches: [[name: 'FETCH_HEAD']],
+          userRemoteConfigs: [[
+            refspec: 'refs/tags/$MBEDTLS_VERSION',
+            url: params.MBEDTLS_URL
+          ]]
+        ]
+      )
+    }
     dir("mcuboot") {
       checkout(
         changelog: false,

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index e1a1493..8b9fcb9 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -47,6 +47,7 @@
   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)
   params += string(name: 'CODE_COVERAGE_EN', value: env.CODE_COVERAGE_EN)
   return { -> results
@@ -86,6 +87,7 @@
   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)
   return { -> results
     def res = build(job: 'tf-m-build-docs', parameters: params, propagate:false)

jenkins/cppcheck.jpl

diff --git a/jenkins/cppcheck.jpl b/jenkins/cppcheck.jpl
index 6b17d4d..cb76ebb 100644
--- a/jenkins/cppcheck.jpl
+++ b/jenkins/cppcheck.jpl
@@ -42,6 +42,20 @@
         ]
       )
     }
+    dir("mbedtls") {
+      checkout(
+        changelog: false,
+        poll: false,
+        scm: [
+          $class: 'GitSCM',
+          branches: [[name: 'FETCH_HEAD']],
+          userRemoteConfigs: [[
+            refspec: 'refs/tags/$MBEDTLS_VERSION',
+            url: params.MBEDTLS_URL
+          ]]
+        ]
+      )
+    }
     dir("mcuboot") {
       checkout(
         changelog: false,

jenkins/static.jpl

diff --git a/jenkins/static.jpl b/jenkins/static.jpl
index b3a5784..6ada310 100644
--- a/jenkins/static.jpl
+++ b/jenkins/static.jpl
@@ -17,6 +17,7 @@
     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)
     build(job: job_name, parameters: params)
   }