Merge pull request #299 from NASA-IMPACT/dev

Merge dev to master in preparation for release.

Author: sharkinsspatial

.github/workflows/dev_viirs_deployment.yml

@@ -1,8 +1,6 @@
 name: uah dev viirs deployment
 
 on:
-  push:
-    branches: [dev]
   workflow_dispatch:
 
 env:
@@ -28,7 +26,7 @@ jobs:
   dev-viirs-deployment:
     strategy:
       matrix:
-        python: [3.8]
+        python: [3.9]
     runs-on: ubuntu-20.04
     needs: [unit-tests]
     environment:

.github/workflows/mcp_dev_viirs_deployment.yml

@@ -1,8 +1,6 @@
 name: mcp dev viirs deployment
 
 on:
-  push:
-    branches: [dev]
   workflow_dispatch:
 
 env:

README.md

@@ -85,4 +85,4 @@ To run unit test for all included Lambda functions
 
 ```plain
 tox -r
-```
+```

stack/hlsconstructs/batch.py

@@ -143,7 +143,8 @@ def __init__(
             )
 
         compute_resources = aws_batch.CfnComputeEnvironment.ComputeResourcesProperty(
-            allocation_strategy="BEST_FIT_PROGRESSIVE",
+            #  allocation_strategy="BEST_FIT_PROGRESSIVE",
+            allocation_strategy="SPOT_CAPACITY_OPTIMIZED",
             desiredv_cpus=0,
             image_id=image_id,
             instance_role=ecs_instance_profile.ref,

stack/stack.py

@@ -74,7 +74,7 @@ def getenv(key, default):
 
 # Cron settings
 LAADS_CRON = getenv("HLS_LAADS_CRON", "cron(0 0/12 * * ? *)")
-LANDSAT_INCOMPLETE_CRON = getenv("HLS_LANDSAT_INCOMPLETE_CRON", "cron(0 12 * * ? *)")
+LANDSAT_INCOMPLETE_CRON = getenv("HLS_LANDSAT_INCOMPLETE_CRON", "cron(0 0/6 * * ? *)")
 LANDSAT_HISTORIC_INCOMPLETE_CRON = getenv(
     "HLS_LANDSAT_HISTORIC_INCOMPLETE_CRON", "cron(0 0/6 * * ? *)"
 )

tox.ini

@@ -17,8 +17,8 @@ passenv =
   HLS_*
   AWS_*
 commands =
-  nodeenv --node=19.9.0 -p
-  npm install -g aws-cdk@v2.143.0
+  nodeenv --node=20.17.0 --python-virtualenv
+  npm install -g aws-cdk@v2.155.0
   cdk --version
 
 [testenv:dev]