Change endpoint for SGE sources

Signed-off-by: Luca Carrogu <carrogu@amazon.com>

Author: lukeseawalker

CHANGELOG.md

@@ -3,14 +3,12 @@ aws-parallelcluster-cookbook CHANGELOG
 
 This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
 
-2.11.x
------
-
 2.11.3
 -----
 
 **BUG FIXES**
-- Fix cluster update when using proxy setup
+- Fix failure when building AMI, due to SGE sources not available at arc.liv.ac.uk
+- Fix cluster update when using proxy setup.
 - Update ca-certificates package during AMI build time and prevent Chef from using outdated/distrusted CA certificates.
 
 2.11.2

attributes/default.rb

@@ -109,7 +109,7 @@
 # URLs to software packages used during install recipes
 # Gridengine software
 default['cfncluster']['sge']['version'] = '8.1.9'
-default['cfncluster']['sge']['url'] = 'https://arc.liv.ac.uk/downloads/SGE/releases/8.1.9/sge-8.1.9.tar.gz'
+default['cfncluster']['sge']['url'] = 'https://deb.debian.org/debian/pool/main/g/gridengine/gridengine_8.1.9+dfsg.orig.tar.gz'
 # Torque software
 default['cfncluster']['torque']['version'] = '6.1.2'
 default['cfncluster']['torque']['url'] = 'https://github.com/adaptivecomputing/torque/archive/6.1.2.tar.gz'
@@ -362,7 +362,6 @@
                                               r-base libblas-dev libfftw3-dev libffi-dev libxml2-dev mdadm
                                               libgcrypt20-dev libmysqlclient-dev libevent-dev iproute2 python3 python3-pip
                                               libatlas-base-dev libglvnd-dev linux-headers-aws]
-  default['cfncluster']['sge']['url'] = 'https://deb.debian.org/debian/pool/main/g/gridengine/gridengine_8.1.9+dfsg.orig.tar.gz'
   default['cfncluster']['sge']['version'] = '8.1.9+dfsg-9'
 
   case node['platform_version']

files/amazon-2/sge_preinstall.sh

@@ -14,7 +14,7 @@ elif [ -z ${TARBALL_PATH} ]; then
 fi
 
 # Download source archive
-SRC_ARCHIVE_OUTFILE=${TARBALL_URL##*/}
+SRC_ARCHIVE_OUTFILE=${TARBALL_PATH##*/}
 curl --retry 3 --retry-delay 5 -o ${SRC_ARCHIVE_OUTFILE} ${TARBALL_URL}
 
 # Extract source code to apply required patches
@@ -27,4 +27,4 @@ patch --ignore-whitespace -p2 < /tmp/sge-tcsh.patch
 # Re-create the archive in the right folder
 cd ../..
 tar cvfz ${TARBALL_PATH} ${TARBALL_ROOT_DIR}
-echo "Artifact ${TARBALL_ROOT_DIR}.tar.gz correctly created"
+echo "Artifact ${TARBALL_ROOT_DIR}.tar.gz correctly created"

files/centos-8/sge_preinstall.sh

@@ -14,7 +14,7 @@ elif [ -z ${TARBALL_PATH} ]; then
 fi
 
 # Download source archive
-SRC_ARCHIVE_OUTFILE=${TARBALL_URL##*/}
+SRC_ARCHIVE_OUTFILE=${TARBALL_PATH##*/}
 curl --retry 3 --retry-delay 5 -o ${SRC_ARCHIVE_OUTFILE} ${TARBALL_URL}
 
 # Extract source code to apply required patches