From 2336d7c9445ddf63feac7ea853d54d00914d8938 Mon Sep 17 00:00:00 2001 From: Son Date: Tue, 21 Jan 2025 16:39:09 -0800 Subject: [PATCH] Remove the depreciated AMI(CentOS7,FPGA) and update AMI(RHEL7,RHEL8 for Graviton) --- deployment/03-lsf-master.yaml | 102 +++++++++++++++------------- deployment/04-login-server-dcv.yaml | 66 ++++++++++-------- deployment/run-eda-workshop.yaml | 16 ++--- source/config/lsf/user_data.sh | 37 ++++++---- 4 files changed, 123 insertions(+), 98 deletions(-) diff --git a/deployment/03-lsf-master.yaml b/deployment/03-lsf-master.yaml index d5b9da3..4eddb13 100644 --- a/deployment/03-lsf-master.yaml +++ b/deployment/03-lsf-master.yaml @@ -9,45 +9,50 @@ Description: | Mappings: RegionMap: us-east-1: - CentOS75: ami-9887c6e7 - FPGADev15: ami-0a71d776cea7922c1 - ALinux2: ami-035be7bafff33b6b6o - RHEL76Graviton: ami-0e3688b4a755ad736 + #CentOS7: ami-043984dedb185b864 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-0c76662758dc1db64 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0ac664bd64e1dcc6b # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-03c35673bd29a0491 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 us-east-2: - CentOS75: ami-0f2b4fc905b0bd1f1 - FPGADev15: ami-0d3e8847d15d9ad72 - ALinux2: ami-04328208f4f0cf1fe - RHEL76Graviton: ami-0302c1ecc74930ba5 + #CentOS7: ami-03619007682d0cd71 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-02827739a7f5841d3 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-05175b461d18d94d9 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-03c0afd0004ca62be #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 us-west-1: - CentOS75: ami-074e2d6769f445be5 - FPGADev15: ami-06fd3aab7a08e942d - ALinux2: ami-0799ad445b5727125 + #CentOS7: ami-028c66c6fcd906b90 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7 : ami-000f409b704b55cf4 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0853d0de3297e47e0 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-05635de0534eccde5 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 us-west-2: - CentOS75: ami-3ecc8f46 - FPGADev15: ami-068ef4610de0dfb70 - ALinux2: ami-032509850cf9ee54e - RHEL76Graviton: ami-0e00026dd0f3688e2 + #CentOS7: ami-0f510d22242ca183f #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-0b43febdef0c3d1c3 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-06c7fbd87fa7b507c # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-094dbeb0b4beeecfa #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 eu-west-1: # Dublin - CentOS75: ami-3548444c - FPGADev15: ami-0521b6e4d86dad1f1 - ALinux2: ami-0fad7378adf284ce0 - RHEL76Graviton: ami-0b5171a7b859ff1b4 + #CentOS7: ami-0dd3fd68601b3de7f #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-00d8c24eeb5fbfd8c #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0fc56b47fc1f238ee # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-0863b2d3611e5acaf #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-southeast-1: # Singapore - CentOS75: ami-8e0205f2 - FPGADev15: ami-0c4b3ff18b42e34a8 - ALinux2: ami-04677bdaa3c2b6e24 + #CentOS7: ami-0d130eab12d1ea78a #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-000f0ee2950b75cd5 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-047d5a3391704b8b2 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-0d8e10634fd2cc82c #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-southeast-2: # Sydney - CentOS75: ami-d8c21dba - FPGADev15: ami-000e49a33676e256a - ALinux2: ami-0c9d48b5db609ad6e + #CentOS7: ami-075e6c9f6f3ac3804 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-090e5f68ce5a80ae4 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0c372b59cfa8c3d65 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-00ef1ac63f85f6d35 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-northeast-2: # Seoul - CentOS75: ami-06cf2a72dadf92410 - FPGADev15: ami-0bbca7ce2aa871d41 - ALinux2: ami-018a9a930060d38aa + #CentOS7: ami-00609ecc32132c692 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-00a8dd1293ad66f06 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-07a2318163330ee84 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-0be1f4444522e087d #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-northeast-1: # Tokyo - CentOS75: ami-045f38c93733dd48d - FPGADev15: ami-0f741966c7ef2c378 - ALinux2: ami-0d7ed3ddb85b521a6 + #CentOS7: ami-0d2241a860961c70e #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-029993f94b02017d3 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0dbca050974482176 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-04dbe9d488cc45455 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 Parameters: AdminKeyPair: @@ -66,22 +71,23 @@ Parameters: Default: "ALinux2" AllowedValues: - ALinux2 - - CentOS75 + #- CentOS7 + - RHEL7 ComputeAMI: Description: AMI (OS image) for the compute nodes. NOTE - You must first subscribe to this AMI in the AWS Marketplace at https://aws.amazon.com/marketplace/pp/B00O7WM7QW" Type: "String" - Default: "CentOS75" + Default: "RHEL7" AllowedValues: - - CentOS75 - - FPGADev15 - - RHEL76Graviton + #- CentOS7 + - RHEL7 + - RHEL8Graviton GravitonAMI: Description: AMI (OS image) for the graviton compute nodes. Type: "String" - Default: "RHEL76Graviton" + Default: "RHEL8Graviton" AllowedValues: - - RHEL76Graviton + - RHEL8Graviton LSFClusterName: Description: "The name of the LSF cluster." Type: "String" @@ -238,17 +244,17 @@ Resources: yum install -y bc # Install cfn-signal helper script to signal bootstrap completion to CloudFormation - if [[ $OSAMI == "CentOS75" ]]; then - yum install epel-release -y - yum install -y install python-pip - pip install pystache - pip install argparse - pip install requests - yum install -y https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.amzn1.noarch.rpm - ln -s /usr/local/lib/python2.7/site-packages/cfnbootstrap /usr/lib/python2.7/site-packages/cfnbootstrap - else + # if [[ $OSAMI == "CentOS7" ]]; then + # yum install epel-release -y + # yum install -y install python-pip + # pip install pystache + # pip install argparse + # pip install requests + # yum install -y https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.amzn1.noarch.rpm + # ln -s /usr/local/lib/python2.7/site-packages/cfnbootstrap /usr/lib/python2.7/site-packages/cfnbootstrap + # else yum update -y aws-cfn-bootstrap - fi + # fi # Install LSF installer prereqs yum install ed -q -y diff --git a/deployment/04-login-server-dcv.yaml b/deployment/04-login-server-dcv.yaml index 7a77bbb..90a31e0 100644 --- a/deployment/04-login-server-dcv.yaml +++ b/deployment/04-login-server-dcv.yaml @@ -27,41 +27,50 @@ Metadata: Mappings: RegionMap: us-east-1: - CentOS75: ami-9887c6e7 - FPGADev15: ami-0a71d776cea7922c1 - ALinux2: ami-035be7bafff33b6b6 + #CentOS7: ami-043984dedb185b864 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-0c76662758dc1db64 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0ac664bd64e1dcc6b # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-03c35673bd29a0491 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 us-east-2: - CentOS75: ami-0f2b4fc905b0bd1f1 - FPGADev15: ami-0d3e8847d15d9ad72 - ALinux2: ami-04328208f4f0cf1fe + #CentOS7: ami-03619007682d0cd71 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-02827739a7f5841d3 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-05175b461d18d94d9 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-03c0afd0004ca62be #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 us-west-1: - CentOS75: ami-074e2d6769f445be5 - FPGADev15: ami-06fd3aab7a08e942d - ALinux2: ami-0799ad445b5727125 + #CentOS7: ami-028c66c6fcd906b90 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7 : ami-000f409b704b55cf4 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0853d0de3297e47e0 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-05635de0534eccde5 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 us-west-2: - CentOS75: ami-3ecc8f46 - FPGADev15: ami-068ef4610de0dfb70 - ALinux2: ami-032509850cf9ee54e + #CentOS7: ami-0f510d22242ca183f #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-0b43febdef0c3d1c3 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-06c7fbd87fa7b507c # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-094dbeb0b4beeecfa #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 eu-west-1: # Dublin - CentOS75: ami-3548444c - FPGADev15: ami-0521b6e4d86dad1f1 - ALinux2: ami-0fad7378adf284ce0 + #CentOS7: ami-0dd3fd68601b3de7f #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-00d8c24eeb5fbfd8c #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0fc56b47fc1f238ee # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-0863b2d3611e5acaf #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-southeast-1: # Singapore - CentOS75: ami-8e0205f2 - FPGADev15: ami-0c4b3ff18b42e34a8 - ALinux2: ami-04677bdaa3c2b6e24 + #CentOS7: ami-0d130eab12d1ea78a #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-000f0ee2950b75cd5 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-047d5a3391704b8b2 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-0d8e10634fd2cc82c #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-southeast-2: # Sydney - CentOS75: ami-d8c21dba - FPGADev15: ami-000e49a33676e256a - ALinux2: ami-0c9d48b5db609ad6e + #CentOS7: ami-075e6c9f6f3ac3804 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-090e5f68ce5a80ae4 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0c372b59cfa8c3d65 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-00ef1ac63f85f6d35 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-northeast-2: # Seoul - CentOS75: ami-06cf2a72dadf92410 - FPGADev15: ami-0bbca7ce2aa871d41 - ALinux2: ami-018a9a930060d38aa + #CentOS7: ami-00609ecc32132c692 #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-00a8dd1293ad66f06 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-07a2318163330ee84 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-0be1f4444522e087d #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 ap-northeast-1: # Tokyo - CentOS75: ami-045f38c93733dd48d - FPGADev15: ami-0f741966c7ef2c378 - ALinux2: ami-0d7ed3ddb85b521a6 + #CentOS7: ami-0d2241a860961c70e #CentOS Linux 7-prod-eukkzvj25vgkc + RHEL7: ami-029993f94b02017d3 #RHEL-7.9_HVM-20240930-x86_64-0-Hourly2-GP3 + ALinux2: ami-0dbca050974482176 # amzn2-ami-hvm-2.0.20241217.0-x86_64-gp2 + RHEL8Graviton: ami-04dbe9d488cc45455 #RHEL-8.10.0_HVM-20241210-arm64-1622-Hourly2-GP3 Parameters: AdminKeyPair: @@ -86,8 +95,7 @@ Parameters: Default: ALinux2 AllowedValues: - ALinux2 - - CentOS75 - - FPGADev15 + #- CentOS7 LSFClusterName: Default: LSFCluster Description: An environment name that will be prefixed to resource names diff --git a/deployment/run-eda-workshop.yaml b/deployment/run-eda-workshop.yaml index 0a957c3..c97c4c4 100644 --- a/deployment/run-eda-workshop.yaml +++ b/deployment/run-eda-workshop.yaml @@ -173,19 +173,19 @@ Parameters: Default: ALinux2 AllowedValues: - ALinux2 - - CentOS75 + #- CentOS7 + - RHEL7 ComputeAMI: Description: > - 'FPGADev' provides access to the Xilinx Vivado EDA software. Use this when deploying the AWS EDA workshop. Choose 'CentOS' if you intend to run your own workloads in this environment. NOTE: You must first subscribe to these AMIs in the AWS Marketplace. See included documentation for details. Type: String - Default: CentOS75 + Default: RHEL7 AllowedValues: - - FPGADev15 - - CentOS75 - - RHEL76Graviton + #- CentOS7 + - RHEL7 + - RHEL8Graviton LSFClusterName: Description: The name of the computing environment. This will also be the name of the LSF cluster. @@ -240,8 +240,8 @@ Parameters: Type: String Default: ALinux2 AllowedValues: - - CentOS75 - - FPGADev15 + #- CentOS7 + - RHEL7 - ALinux2 VpcAz: diff --git a/source/config/lsf/user_data.sh b/source/config/lsf/user_data.sh index c15c0f9..f9524f2 100644 --- a/source/config/lsf/user_data.sh +++ b/source/config/lsf/user_data.sh @@ -16,6 +16,10 @@ export LSF_INSTALL_DIR_ROOT="/`echo $LSF_INSTALL_DIR | cut -d / -f2`" export LSF_ADMIN=lsfadmin export ARCH="`uname -p`" +#OS verserion +. /etc/os-release +export OS_VERSION=`echo $VERSION_ID | awk -F. '{print $1}'` + # Add the LSF admin account useradd -m -u 1500 $LSF_ADMIN # Add DCV login user account @@ -39,10 +43,12 @@ if [[ $ARCH == "x86_64" ]]; then done fi -# enable NFS for aarch64 AMI -if [[ $ARCH == "aarch64" ]]; then - yum -y install nfs-utils - service nfs start +# enable NFS +yum -y install nfs-utils #Amazon LUNUX/RHEL +if [[ $ID == "rhel" && $OS_VERSION == "8" ]]; then + sudo service nfs-server start +else + service nfs start fi # mount shared file systems @@ -75,21 +81,21 @@ else fi ## Set up Python3 environment for OpenLane -sudo yum install -y python3 python3-pip -python3 -m pip install --upgrade --no-cache-dir volare +# sudo yum install -y python3 python3-pip +# python3 -m pip install --upgrade --no-cache-dir volare ## Install Git for OpenLane -sudo yum install -y git +# sudo yum install -y git ## Set up Docker environment for OpenLane -sudo yum install -y yum-utils -sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo -sudo yum install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -sudo systemctl start docker +# sudo yum install -y yum-utils +# sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo +# sudo yum install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +# sudo systemctl start docker ## Add "simuser" as docker group to run docker without root -sudo groupadd docker -sudo usermod -aG docker ${DCV_USER_NAME} +# sudo groupadd docker +# sudo usermod -aG docker ${DCV_USER_NAME} ## Set up the LSF environment # if [[ $ARCH == "aarch64" ]]; then @@ -153,6 +159,11 @@ if [ -n "${ssd}" ]; then echo "Updated LSF_LOCAL_RESOURCES lsf.conf with [resource ${ssd}]" fi +# LSF library installation for aarch64 AMI +if [[ $ARCH == "aarch64" ]]; then + yum -y install libnsl +fi + # Start LSF Daemons lsadmin limstartup lsadmin resstartup