Travis: Add tests for Mbed CLI 2 builds

Author: LDong-Arm

.travis.yml

@@ -20,6 +20,9 @@ dist: focal
 
 addons:
   apt:
+    sources:
+      - sourceline: 'deb https://apt.kitware.com/ubuntu/ focal main'
+        key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
     packages:
       - cmake
       - srecord
@@ -42,7 +45,7 @@ matrix:
 
     - &compile-tests
       stage: "Compile"
-      name: "Compile Regression and Compliance tests - ARM_MUSCA_S1"
+      name: "Compile Regression and Compliance tests - ARM_MUSCA_S1, Mbed CLI 1"
       env: TARGET_NAME=ARM_MUSCA_S1 CACHE_NAME=ARM_MUSCA_S1
       language: python
       python: 3.8
@@ -54,6 +57,14 @@ matrix:
         - export PATH="$PATH:${PWD}/gcc-arm-none-eabi-9-2019-q4-major/bin"
         - arm-none-eabi-gcc --version
         - popd
+        # Hide Travis-preinstalled CMake
+        # The Travis-preinstalled CMake is unfortunately not installed via apt, so we
+        # can't replace it with an apt-supplied version very easily. Additionally, we
+        # can't permit the Travis-preinstalled copy to survive, as the Travis default
+        # path lists the Travis CMake install location ahead of any place where apt
+        # would install CMake to. Instead of apt removing or upgrading to a new CMake
+        # version, we must instead delete the Travis copy of CMake.
+        - sudo rm -rf /usr/local/cmake*
         # Setup ccache
         - ccache -o compiler_check=content
         - ccache -M 1G
@@ -64,15 +75,33 @@ matrix:
         # Fetch mbed-os: We use manual clone, with depth=1 and --single-branch to save time.
         - git clone --depth=1 --single-branch --branch=feature-tf-m-1.2-integration https://github.com/ARMmbed/mbed-os.git
         # Install Mbed CLI and dependencies
-        - pip install --upgrade mbed-cli
+        - pip install --upgrade mbed-cli mbed-tools
         - pip install -r mbed-os/requirements.txt
       script:
+        # Mbed CLI 2 build output conflicts with Mbed CLI 1
+        - rm -rf cmake_build
         # Build TF-M and all tests
         - python3 test_psa_target.py -t GNUARM -m ${TARGET_NAME} -b
         - ccache -s
 
+    - <<: *compile-tests
+      name: "Compile Regression and Compliance tests - ARM_MUSCA_S1, Mbed CLI 2"
+      env: TARGET_NAME=ARM_MUSCA_S1 CACHE_NAME=ARM_MUSCA_S1-CLI2
+      script:
+        # Build TF-M and all tests with Mbed CLI 2
+        - python3 test_psa_target.py -t GNUARM -m ${TARGET_NAME} --cli=2 -b
+        - ccache -s
+
     # ARM_MUSCA_B1
 
     - <<: *compile-tests
-      name: "Compile Regression and Compliance tests - ARM_MUSCA_B1"
+      name: "Compile Regression and Compliance tests - ARM_MUSCA_B1, Mbed CLI 1"
       env: TARGET_NAME=ARM_MUSCA_B1 CACHE_NAME=ARM_MUSCA_B1
+
+    - <<: *compile-tests
+      name: "Compile Regression and Compliance tests - ARM_MUSCA_B1, Mbed CLI 2"
+      env: TARGET_NAME=ARM_MUSCA_B1 CACHE_NAME=ARM_MUSCA_B1-CLI2
+      script:
+        # Build TF-M and all tests with Mbed CLI 2
+        - python3 test_psa_target.py -t GNUARM -m ${TARGET_NAME} --cli=2 -b
+        - ccache -s