use new SPOT_PRICE_CAPACITY_OPTIMIZED allocation strategy for all dep…

…loyments
ASFHyP3 · Oct 31, 2023 · 2a610f3 · 2a610f3
1 parent 9937eb3
commit 2a610f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [4.3.0]
 ### Added
 - An `iterative_min_size` parameter has been added to the `WATER_MAP_TEST` job spec.
-#### Changed
+### Changed
 - For `WATER_MAP_TEST` jobs, the default `minimization_metric` is now `ts`.
 - Use Amazon Linux 2023 AMI in non-Earthdata Cloud environments
+- All deployments now use the `SPOT_PRICE_CAPACITY_OPTIMIZED` allocation strategy for AWS Batch. This includes JPL
+  deployments, reverting the temporary change to On Demand instances in HyP3 v3.10.8
 
 ## [4.2.1]
 ### Changed

diff --git a/apps/compute-cf.yml.j2 b/apps/compute-cf.yml.j2
@@ -69,13 +69,8 @@ Resources:
       ServiceRole: !GetAtt BatchServiceRole.Arn
       Type: MANAGED
       ComputeResources:
-        {% if security_environment in ('JPL', 'JPL-public') %}
-        Type: EC2
-        AllocationStrategy: BEST_FIT_PROGRESSIVE
-        {% else %}
         Type: SPOT
-        AllocationStrategy: SPOT_CAPACITY_OPTIMIZED
-        {% endif %}
+        AllocationStrategy: SPOT_PRICE_CAPACITY_OPTIMIZED
         MinvCpus: 0
         MaxvCpus: !Ref MaxvCpus
         InstanceTypes: !Ref InstanceTypes