Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PC 3.6 fixes #42

Merged
merged 9 commits into from
Jul 4, 2023
Merged

PC 3.6 fixes #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfede4b
pc3.6 fix
Jul 3, 2023
0586d1f
Merge pull request #1 from cmbrehm/fix/pc3.6
cmbrehm Jul 3, 2023
1878a16
fix
Jul 3, 2023
92d0de7
Merge pull request #2 from cmbrehm/fix/pc3.6
cmbrehm Jul 3, 2023
e2dc637
fix post.install.sh
Jul 3, 2023
8107240
Merge pull request #3 from cmbrehm/fix/pc3.6
cmbrehm Jul 3, 2023
363b082
argh
Jul 3, 2023
df1fa2a
Merge pull request #4 from cmbrehm/fix/pc3.6
cmbrehm Jul 3, 2023
33e57d8
typo
Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Templates/AWS-HPC-Cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ Parameters:
AllowedPattern: ^(AUTO|ldaps?://.+)$
Default : AUTO

GitHubUrl:
Description: 'Location of installation files'
Type: String
AllowedPattern: ^https://.*$
Default: https://github.com/aws-samples/1click-hpc

Conditions:
CreateVpc: !Equals [!Ref VpcId, AUTO]
CreateAD: !Equals [!Ref AD, AUTO]
Expand Down Expand Up @@ -364,7 +370,7 @@ Resources:
- echo LANG=en_US.utf-8 >> /etc/environment
- echo LC_ALL=en_US.UTF-8 >> /etc/environment
- cd /home/ec2-user/environment
- git clone "https://github.com/aws-samples/1click-hpc"
- !Sub git clone ${GitHubUrl}
- !Sub echo "export AWS_DEFAULT_REGION=${AWS::Region}" >> cluster_env
- !Sub echo "export AWS_REGION_NAME=${AWS::Region}" >> cluster_env
- !Sub echo "export S3_BUCKET=${Cloud9OutputBucket}" >> cluster_env
Expand Down
2 changes: 2 additions & 0 deletions scripts/Cloud9-Bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ export FSX
/usr/bin/envsubst '${SLURM_DB_ENDPOINT}' < "1click-hpc/enginframe/mysql/efdb.config" > efdb.config
/usr/bin/envsubst '${SLURM_DB_ENDPOINT}' < "1click-hpc/enginframe/efinstall.config" > efinstall.config
/usr/bin/envsubst '${S3_BUCKET}' < "1click-hpc/enginframe/fm.browse.ui" > fm.browse.ui
/usr/bin/envsubst '${POST_INSTALL}' < "1click-hpc/scripts/post.install.sh" > post.install.sh

aws s3 cp --quiet efinstall.config "s3://${S3_BUCKET}/1click-hpc/enginframe/efinstall.config" --region "${AWS_REGION_NAME}"
aws s3 cp --quiet fm.browse.ui "s3://${S3_BUCKET}/1click-hpc/enginframe/fm.browse.ui" --region "${AWS_REGION_NAME}"
aws s3 cp --quiet efdb.config "s3://${S3_BUCKET}/1click-hpc/enginframe/mysql/efdb.config" --region "${AWS_REGION_NAME}"
aws s3 cp --quiet post.install.sh "s3://${S3_BUCKET}/1click-hpc/scripts/post.install.sh" --region "${AWS_REGION_NAME}"
aws s3 cp --quiet /usr/bin/mysql "s3://${S3_BUCKET}/1click-hpc/enginframe/mysql/mysql" --region "${AWS_REGION_NAME}"
rm -f fm.browse.ui efinstall.config

Expand Down
3 changes: 1 addition & 2 deletions scripts/post.install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ main() {
runScripts "${@}"
echo "[INFO][$(date '+%Y-%m-%d %H:%M:%S')] post.install.sh: STOP" >&2
}

TMP_MODULES_DIR="/tmp/modules/"
export host_name=$(hostname -s)
export SLURM_CONF_FILE="/opt/slurm/etc/pcluster/slurm_parallelcluster_*_partition.conf"
post_install_url=$(dirname ${cfn_postinstall})
post_install_url=$(dirname ${POST_INSTALL})
export post_install_base=$(dirname "${post_install_url}")
SLURM_ROOT="/opt/slurm"
export SLURM_ETC="${SLURM_ROOT}/etc"
Expand Down