Skip to content

Commit 2be5672

Browse files
committed
[ARMPL] Fix a bug in the installation of ARM Performance Library that was causing the build image fail in isolated environments due to cookbook retrieving GCC dependencies from GCC website rather than ParallelCluster bucket.
1 parent 744bef2 commit 2be5672

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ This file is used to list changes made in each version of the AWS ParallelCluste
99
**CHANGES**
1010
- Upgrade Slurm to version 24.05.8.
1111

12+
**BUG FIXES**
13+
- Fix a bug in the installation of ARM Performance Library that was causing the build image fail in isolated environments
14+
due to cookbook retrieving GCC dependencies from GCC website rather than ParallelCluster bucket.
15+
1216
3.13.0
1317
------
1418
**ENHANCEMENTS**

cookbooks/aws-parallelcluster-platform/resources/arm_pl/partial/_arm_pl_common.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,15 @@
119119
group 'root'
120120
cwd new_resource.sources_dir
121121
code <<-GCC
122-
set -e
122+
set -ex
123123
124124
# Remove dir if it exists. This happens in case of retries.
125125
rm -rf gcc-#{gcc_version}
126126
tar -xf #{gcc_tarball}
127127
cd gcc-#{gcc_version}
128-
# Patch the download_prerequisites script to download over https and not ftp. This works better in China regions.
129-
sed -i "s#ftp://gcc\.gnu\.org/pub/gcc/infrastructure##{node['cluster']['artifacts_s3_url']}/dependencies/gcc/prerequisites#g" ./contrib/download_prerequisites
128+
# Patch the download_prerequisites script to download GCC dependencies from our public bucket.
129+
# This is required to support build image in isolated environments.
130+
sed -i "s#http://gcc\.gnu\.org/pub/gcc/infrastructure##{node['cluster']['artifacts_s3_url']}/dependencies/gcc/prerequisites#g" ./contrib/download_prerequisites
130131
./contrib/download_prerequisites
131132
mkdir build && cd build
132133
../configure --prefix=/opt/arm/armpl/gcc/#{gcc_version} --disable-bootstrap --enable-checking=release --enable-languages=c,c++,fortran --disable-multilib

0 commit comments

Comments
 (0)