ci: Consolidate APT package install steps

Consolidate the installation steps for the components that are packaged
using APT.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

Author: stephanosio

Dockerfile.ci

@@ -36,6 +36,39 @@ ARG FVP_CORSTONE320_VERSION=11.27_25
 ENV FVP_CORSTONE320_VERSION=$FVP_CORSTONE320_VERSION
 ARG WGET_ARGS="-q --show-progress --progress=bar:force:noscroll"
 
+# Install APT packages
+RUN <<EOF
+	# Install renode (x86 only)
+	# NOTE: Renode is currently only available for x86_64 host.
+	if [ "${HOSTTYPE}" = "x86_64" ]; then
+		apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+		echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official-stable.list
+		apt-get -y update
+		wget ${WGET_ARGS} https://github.com/renode/renode/releases/download/v${RENODE_VERSION}/renode_${RENODE_VERSION}_amd64.deb
+		apt-get install -y ./renode_${RENODE_VERSION}_amd64.deb
+		rm renode_${RENODE_VERSION}_amd64.deb
+		pip3 install -r /opt/renode/tests/requirements.txt --no-cache-dir
+	fi
+
+	# Install LLVM and Clang
+	wget ${WGET_ARGS} https://apt.llvm.org/llvm.sh
+	chmod +x llvm.sh
+	./llvm.sh ${LLVM_VERSION} all
+	rm -f llvm.sh
+
+	# Install Python 3.9 for FVP
+	add-apt-repository -y ppa:deadsnakes/ppa
+	apt-get update -y
+	apt-get install -y python3.9-dev
+
+	# Clean up stale packages
+	apt-get autoremove --purge -y
+
+	# Clean up local repository
+	apt-get clean -y
+	rm -rf /var/lib/apt/lists/*
+EOF
+
 # Install Kitware ninja
 # NOTE: Pre-built Kitware ninja binaries are only available for x86_64 host.
 RUN <<EOF
@@ -69,21 +102,6 @@ RUN <<EOF
 	fi
 EOF
 
-
-# Install renode (x86 only)
-# NOTE: Renode is currently only available for x86_64 host.
-RUN <<EOF
-	if [ "${HOSTTYPE}" = "x86_64" ]; then
-		apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-		echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official-stable.list
-		apt-get -y update
-		wget ${WGET_ARGS} https://github.com/renode/renode/releases/download/v${RENODE_VERSION}/renode_${RENODE_VERSION}_amd64.deb
-		apt-get install -y ./renode_${RENODE_VERSION}_amd64.deb
-		rm renode_${RENODE_VERSION}_amd64.deb
-		pip3 install -r /opt/renode/tests/requirements.txt --no-cache-dir
-	fi
-EOF
-
 # Install BSIM
 # Note: west needs an extra folder level, so we create a link to the old location to be backwards compatible
 RUN <<EOF
@@ -116,14 +134,6 @@ RUN <<EOF
 	~/.cargo/bin/rustup target install x86_64-unknown-none
 EOF
 
-# Install LLVM and Clang
-RUN <<EOF
-	wget ${WGET_ARGS} https://apt.llvm.org/llvm.sh
-	chmod +x llvm.sh
-	./llvm.sh ${LLVM_VERSION} all
-	rm -f llvm.sh
-EOF
-
 # Install sparse package for static analysis
 RUN <<EOF
 	mkdir -p /opt/sparse
@@ -151,12 +161,6 @@ EOF
 #
 # Ecosystem FVP License permits redistribution (refer to the relevant license available in the container).
 RUN <<EOF
-	set -o pipefail
-	apt update
-	apt install software-properties-common
-	add-apt-repository -y ppa:deadsnakes/ppa
-	apt install -y python3.9-dev
-
 	mkdir -p /opt/fvps
 	cd /opt/fvps
 
@@ -205,13 +209,6 @@ RUN <<EOF
 	rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz
 EOF
 
-# Clean up stale packages
-RUN <<EOF
-	apt-get clean -y
-	apt-get autoremove --purge -y
-	rm -rf /var/lib/apt/lists/*
-EOF
-
 # Run the Zephyr SDK setup script as 'user' in order to ensure that the
 # `Zephyr-sdk` CMake package is located in the package registry under the
 # user's home directory.