diff --git a/attributes/default.rb b/attributes/default.rb index 1019a3ee6b..1b9e9434a3 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -302,7 +302,7 @@ if node['platform_version'] == '18.04' default['cfncluster']['base_packages'].delete('libatlas-dev') default['cfncluster']['base_packages'].push('libatlas-base-dev', 'libssl-dev', 'libglvnd-dev') - default['cfncluster']['sge']['version'] = '8.1.9+dfsg-9build1' + default['cfncluster']['sge']['version'] = '8.1.9+dfsg-9build2' end # Modulefile Directory diff --git a/files/ubuntu-18.04/sge_preinstall.sh b/files/ubuntu-18.04/sge_preinstall.sh index ae8ca166fb..e99d7b2998 100644 --- a/files/ubuntu-18.04/sge_preinstall.sh +++ b/files/ubuntu-18.04/sge_preinstall.sh @@ -4,16 +4,16 @@ echo "Downloading and extracting source packages for $TARBALL_ROOT_DIR" pkg_version="$VERSION" -#adds eon source packages +#adds focal source packages src_bionic=`sed -n '/#\s*deb-src .* bionic universe/p' /etc/apt/sources.list` # FIXME: if China region use US repository if [ "${REGION}" != "${REGION#cn-*}" ]; then - src_eoan="deb-src http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ eoan universe" + src_focal="deb-src http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ focal universe" else - src_eoan=`echo "${src_bionic}" | sed -e 's/#//' -e 's/bionic/eoan/'` + src_focal=`echo "${src_bionic}" | sed -e 's/#//' -e 's/bionic/focal/'` fi -echo $src_eoan >> /etc/apt/sources.list +echo $src_focal >> /etc/apt/sources.list apt update mkdir /tmp/gridengine && cd /tmp/gridengine @@ -22,7 +22,7 @@ root_dir=`ls -d */` mv "$root_dir" $TARBALL_ROOT_DIR tar cvfz $TARBALL_PATH $TARBALL_ROOT_DIR -#removes eon source packages +#removes focal source packages sed -i '$d' /etc/apt/sources.list apt update echo "Artifact $TARBALL_ROOT_DIR.tar.gz correctly created"