Skip to content

Commit

Permalink
use Amazon Linux 2023 AMI in non-EDC environments
Browse files Browse the repository at this point in the history
  • Loading branch information
asjohnston-asf committed Oct 25, 2023
1 parent 899f128 commit 5ec2bf4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-enterprise-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

environment:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/deploy-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
expanded_max_vcpus: 10000
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-a19-jpl
Expand All @@ -44,7 +44,7 @@ jobs:
expanded_max_vcpus: 10000
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-tibet-jpl
Expand All @@ -59,7 +59,7 @@ jobs:
expanded_max_vcpus: 0
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-nisar-jpl
Expand All @@ -74,7 +74,7 @@ jobs:
expanded_max_vcpus: 1600
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-avo
Expand All @@ -89,7 +89,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-watermap
Expand All @@ -104,7 +104,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-streamflow
Expand All @@ -119,7 +119,7 @@ jobs:
expanded_max_vcpus: 1600
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: azdwr-hyp3
Expand All @@ -134,7 +134,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-cargill
Expand All @@ -149,7 +149,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-bgc-engineering
Expand All @@ -164,7 +164,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-carter
Expand All @@ -179,7 +179,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

- environment: hyp3-pdc
Expand All @@ -196,7 +196,7 @@ jobs:
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
distribution_url: ''

environment:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.2.2]
### Changed
- Use Amazon Linux 2023 AMI in non-Earthdata Cloud environments

## [4.2.1]
### Changed
- The `ami_id` for EDC platforms now uses the original AMI.
Expand Down
2 changes: 1 addition & 1 deletion apps/main-cf.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Parameters:

AmiId:
Type: AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>
Default: /aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id
Default: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id

DefaultMaxvCpus:
Description: Default maximum size for the AWS Batch compute environment
Expand Down

0 comments on commit 5ec2bf4

Please sign in to comment.