diff --git a/.github/workflows/dev_viirs_deployment.yml b/.github/workflows/dev_viirs_deployment.yml index 43f5c59..b753aab 100644 --- a/.github/workflows/dev_viirs_deployment.yml +++ b/.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: diff --git a/.github/workflows/mcp_dev_viirs_deployment.yml b/.github/workflows/mcp_dev_viirs_deployment.yml index 2092a89..9ed9282 100644 --- a/.github/workflows/mcp_dev_viirs_deployment.yml +++ b/.github/workflows/mcp_dev_viirs_deployment.yml @@ -1,8 +1,6 @@ name: mcp dev viirs deployment on: - push: - branches: [dev] workflow_dispatch: env: diff --git a/README.md b/README.md index 90effeb..a16639c 100644 --- a/README.md +++ b/README.md @@ -85,4 +85,4 @@ To run unit test for all included Lambda functions ```plain tox -r -``` \ No newline at end of file +``` diff --git a/stack/hlsconstructs/batch.py b/stack/hlsconstructs/batch.py index 4c3dc1e..ada0e6f 100644 --- a/stack/hlsconstructs/batch.py +++ b/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, diff --git a/stack/stack.py b/stack/stack.py index 5d33043..cad0ba3 100644 --- a/stack/stack.py +++ b/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 * * ? *)" ) diff --git a/tox.ini b/tox.ini index 39d845f..c3c0a99 100644 --- a/tox.ini +++ b/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]