jammy-amd64-tf-a-build: Remove ArmClang 6.17 now that we switched to 6.18
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I2ef2a7fd4aedc21831780e361bd8391840c47ca0
diff --git a/jammy-amd64-tf-a-build/Dockerfile b/jammy-amd64-tf-a-build/Dockerfile
index eee9394..dad94e8 100644
--- a/jammy-amd64-tf-a-build/Dockerfile
+++ b/jammy-amd64-tf-a-build/Dockerfile
@@ -66,7 +66,6 @@
COPY setup-sshd /usr/sbin/setup-sshd
# Copy armclang toolchains
-COPY DS500-BN-*.tar.gz /tmp/
COPY ARMCompiler*.tar.gz /tmp/
RUN set -ex ;\
diff --git a/jammy-amd64-tf-a-build/build.sh b/jammy-amd64-tf-a-build/build.sh
index 633a75c..7d9b84a 100755
--- a/jammy-amd64-tf-a-build/build.sh
+++ b/jammy-amd64-tf-a-build/build.sh
@@ -19,7 +19,6 @@
# Copy armclang toolchains required for the build (previously fetched
# from s3://trustedfirmware-private/armclang/ by build harness).
-cp ../DS500-BN-00026-r5p0-11rel0.tar.gz ../DS500-BN-00026-r5p0-19rel0.tar.gz .
cp ../ARMCompiler6.18_standalone_linux-x86_64.tar.gz .
image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
diff --git a/jammy-amd64-tf-a-build/tf-dependencies.install b/jammy-amd64-tf-a-build/tf-dependencies.install
index 5942e2f..8fc779d 100755
--- a/jammy-amd64-tf-a-build/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build/tf-dependencies.install
@@ -44,11 +44,6 @@
https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz
tar -Jxf /tmp/gcc-linaro-x86_64_aarch64-linux-gnu.tar.xz -C ${TOOLS_DIR}
-# Install Arm Clang 6.17 toolchain (armclang)
-mkdir -p /tmp/armclang-6.17
-tar -xf /tmp/DS500-BN-00026-r5p0-19rel0.tar.gz -C /tmp/armclang-6.17
-/tmp/armclang-6.17/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.17
-
# Install Arm Clang 6.18 toolchain (armclang)
mkdir -p /tmp/armclang-6.18
tar -xf /tmp/ARMCompiler6.18_standalone_linux-x86_64.tar.gz -C /tmp/armclang-6.18