Use GCC5 and create variables for GCC versions

Build using GCC5.

The GCC download URLs are created using a formula.  Create variables to
replicate that formula.

There is a potential for the formula on the server to change and break
this script again.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

1 files changed, 30 insertions, 16 deletions

diff --git a/platforms-ci.sh b/platforms-ci.sh
index 7c8f615..18becf8 100755
--- a/platforms-ci.sh
+++ b/platforms-ci.sh
@@ -48,6 +48,9 @@ if [ "$JOB_NAME" != "" ]; then
 	sudo apt-get install -y --force-yes python-wand
 	sudo apt-get install -y --force-yes uuid-dev
 
+	# Additional dependencies needed for this CI script
+	sudo apt-get install -y --force-yes zip
+
 	if [ "$USE_PRE_INSTALLED_TOOLCHAIN" == "yes" ]; then
 		# Toolchain
 		echo ls ${HOME}/srv/toolchain/
@@ -116,27 +119,37 @@ function check_workspace
 	done
 }
 
-aarch64gcc=gcc-linaro-4.9-2015.05-x86_64_aarch64-linux-gnu.tar.xz
-aarch32gcc=gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf.tar.xz
+gcc_major=5
+gcc_minor=3
+gcc_rev=1
+gcc_rel=2016.05
+gcc_dir_ver=${gcc_major}.${gcc_minor}-${gcc_rel}
+gcc_file_ver=${gcc_major}.${gcc_minor}.${gcc_rev}-${gcc_rel}
+gcc_aarch64=gcc-linaro-${gcc_file_ver}-x86_64_aarch64-linux-gnu.tar.xz
+gcc_aarch32=gcc-linaro-${gcc_file_ver}-x86_64_arm-linux-gnueabihf.tar.xz
+gcc_url=http://releases.linaro.org/components/toolchain/binaries/${gcc_dir_ver}
+aarch64gcc_url=${gcc_url}/aarch64-linux-gnu/$gcc_aarch64
+aarch32gcc_url=${gcc_url}/arm-linux-gnueabihf/$gcc_aarch32
 
 function download_toolchain
 {
 	pushd $JENKINS_WORKSPACE
-	if [ ! -e $aarch64gcc ]; then
-		wget http://releases.linaro.org/archive/15.05/components/toolchain/binaries/aarch64-linux-gnu/$aarch64gcc
+	if [ ! -e $gcc_aarch64 ]; then
+		wget $aarch64gcc_url
 	else
-		echo "We already have $aarch64gcc"
+		echo "We already have $gcc_aarch64"
 	fi
-	if [ ! -e $aarch32gcc ]; then
-		wget http://releases.linaro.org/archive/15.05/components/toolchain/binaries/arm-linux-gnueabihf/$aarch32gcc
+	if [ ! -e $gcc_aarch32 ]; then
+		wget $aarch32gcc_url
 	else
-		echo "We already have $aarch32gcc"
+		echo "We already have $gcc_aarch32"
 	fi
 
 	echo toolchains downloaded
 	ls -al
 	popd
 }
+
 function install_toolchain
 {
 	local gccdir=tools/gcc
@@ -144,16 +157,16 @@ function install_toolchain
 	mkdir -p $gccdir
 	pushd $gccdir
 
-	if [ -e $JENKINS_WORKSPACE/$aarch64gcc ]; then
-		tar xf $JENKINS_WORKSPACE/$aarch64gcc
+	if [ -e $JENKINS_WORKSPACE/$gcc_aarch64 ]; then
+		tar xf $JENKINS_WORKSPACE/$gcc_aarch64
 	else
-		echo "ERROR: failed to download aarch64 gcc $aarch64gcc"
+		echo "ERROR: failed to download aarch64 gcc $gcc_aarch64"
 		exit
 	fi
-	if [ -e $JENKINS_WORKSPACE/$aarch32gcc ]; then
-		tar xf $JENKINS_WORKSPACE/$aarch32gcc
+	if [ -e $JENKINS_WORKSPACE/$gcc_aarch32 ]; then
+		tar xf $JENKINS_WORKSPACE/$gcc_aarch32
 	else
-		echo "ERROR: failed to download aarch32 gcc $aarch32gcc"
+		echo "ERROR: failed to download aarch32 gcc $gcc_aarch32"
 		exit
 	fi
 
@@ -199,7 +212,7 @@ function create_release_zip
 		juno )
 			cp -R $workspace/recovery/* $to
 			cp -R $from/* $to/SOFTWARE
-			cp $workspace/uefi/edk2/Build/ArmJuno/DEBUG_GCC49/FV/BL33_AP_UEFI.fd $to/SOFTWARE/bl33-uefi.bin
+			cp $workspace/uefi/edk2/Build/ArmJuno/DEBUG_GCC${gcc_major}/FV/BL33_AP_UEFI.fd $to/SOFTWARE/bl33-uefi.bin
 			if [ "$manifest" != "uefi" ] && [ "$manifest" != "pinned-uefi" ]; then
 				cp $workspace/output/${variant}/components/${variant}/uboot.bin $to/SOFTWARE/bl33-uboot.bin
 			fi
@@ -207,7 +220,8 @@ function create_release_zip
 		fvp )
 			cp $workspace/model-scripts/run_model.sh $to
 			cp -R $from/* $to
-			cp $workspace/uefi/edk2/Build/ArmVExpress-FVP-AArch64/DEBUG_GCC49/FV/FVP_AARCH64_EFI.fd $to/bl33-uefi.bin
+			cp
+$workspace/uefi/edk2/Build/ArmVExpress-FVP-AArch64/DEBUG_GCC${gcc_major}/FV/FVP_AARCH64_EFI.fd $to/bl33-uefi.bin
 			if [ "$manifest" != "uefi" ] && [ "$manifest" != "pinned-uefi" ]; then
 				cp $workspace/output/${variant}/components/${variant}/uboot.bin $to/bl33-uboot.bin
 			fi