Merge pull request #2312 from ASFHyP3/develop

Release v7.5.0
ASFHyP3 · Jun 4, 2024 · a86fe97 · a86fe97
2 parents 1318824 + 137f1d8
commit a86fe97
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 12 deletions.
diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml
@@ -84,7 +84,9 @@ jobs:
             default_credits_per_user: 0
             default_application_status: APPROVED
             cost_profile: DEFAULT
-            job_files: job_spec/INSAR_ISCE_BURST.yml
+            job_files: >-
+              job_spec/INSAR_ISCE_BURST.yml
+              job_spec/SRG_GSLC_CPU.yml
             instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
             default_max_vcpus: 640
             expanded_max_vcpus: 640

diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml
@@ -60,8 +60,10 @@ jobs:
             default_credits_per_user: 0
             default_application_status: APPROVED
             cost_profile: DEFAULT
-            job_files: job_spec/INSAR_ISCE.yml
-            instance_types: c6id.xlarge,c6id.2xlarge,c6id.4xlarge,c6id.8xlarge
+            job_files: >-
+              job_spec/ARIA_RAIDER.yml
+              job_spec/INSAR_ISCE_TEST.yml
+            instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
             default_max_vcpus: 1000
             expanded_max_vcpus: 1000
             required_surplus: 0
@@ -232,7 +234,9 @@ jobs:
             default_credits_per_user: 0
             default_application_status: APPROVED
             cost_profile: DEFAULT
-            job_files: job_spec/INSAR_ISCE_BURST.yml
+            job_files: >-
+              job_spec/INSAR_ISCE_BURST.yml
+              job_spec/SRG_GSLC_CPU.yml
             instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
             default_max_vcpus: 640
             expanded_max_vcpus: 640

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ 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).
 
+## [7.5.0]
+
+### Added
+* The `SRG_GSLC_CPU` job spec
+* The `SRG_GSLC_CPU` job type to the `hyp3-lavas` and `hyp3-lavas-test` HyP3 deployments
+
+### Changed
+- The `hyp3-tibet-jpl` deployment now uses the `m6id[n]` instance families and includes the `ARIA_RAIDER` job spec
+
 ## [7.4.0]
 
 ### Added

diff --git a/apps/api/src/hyp3_api/validation.py b/apps/api/src/hyp3_api/validation.py
@@ -42,6 +42,8 @@ def get_cmr_metadata(granules):
             'SENTINEL-1A_DP_GRD_HIGH',
             'SENTINEL-1B_DP_GRD_HIGH',
             'SENTINEL-1_BURSTS',
+            'SENTINEL-1A_RAW',
+            'SENTINEL-1B_RAW',
         ],
         'page_size': 2000,
     }

diff --git a/job_spec/SRG_GSLC_CPU.yml b/job_spec/SRG_GSLC_CPU.yml
@@ -0,0 +1,45 @@
+SRG_GSLC_CPU:
+  required_parameters:
+    - granules
+  parameters:
+    granules:
+      default:  '""'
+      api_schema:
+        type: array
+        minItems: 1
+        maxItems: 6
+        example:
+          - S1A_IW_RAW__0SDV_20231229T134339_20231229T134411_051870_064437_4F42
+          - S1A_IW_RAW__0SDV_20231229T134404_20231229T134436_051870_064437_5F38
+        items:
+          description: Name of the Level-0 Sentinel-1 scenes to process
+          type: string
+          pattern: "^S1[AB]_IW_RAW"
+          minLength: 67
+          maxLength: 67
+          example: S1A_IW_RAW__0SDV_20231229T134404_20231229T134436_051870_064437_5F38
+    bucket_prefix:
+      default:  '""'
+  validators: []
+  cost_profiles:
+    DEFAULT:
+      cost: 1.0
+  tasks:
+    - name: ''
+      image: ghcr.io/asfhyp3/hyp3-back-projection
+      command:
+        - ++process
+        - back_projection
+        - --bucket
+        - '!Ref Bucket'
+        - --bucket-prefix
+        - Ref::bucket_prefix
+        - Ref::granules
+      timeout: 10800
+      vcpu: 1
+      memory: 31500
+      secrets:
+        - EARTHDATA_USERNAME
+        - EARTHDATA_PASSWORD
+        - ESA_USERNAME
+        - ESA_PASSWORD
diff --git a/requirements-all.txt b/requirements-all.txt
@@ -5,16 +5,16 @@
 -r requirements-apps-start-execution-worker.txt
 -r requirements-apps-disable-private-dns.txt
 -r requirements-apps-update-db.txt
-boto3==1.34.109
+boto3==1.34.118
 jinja2==3.1.4
-moto[dynamodb]==5.0.7
+moto[dynamodb]==5.0.9
 pytest==8.2.1
 PyYAML==6.0.1
 responses==0.25.0
 flake8==7.0.0
 flake8-import-order==0.18.2
 flake8-blind-except==0.2.1
 flake8-builtins==2.5.0
-setuptools==69.5.1
+setuptools==70.0.0
 openapi-spec-validator==0.7.1
-cfn-lint==0.87.3
+cfn-lint==0.87.4
diff --git a/requirements-apps-api.txt b/requirements-apps-api.txt
@@ -4,7 +4,7 @@ jsonschema==4.22.0
 openapi-core==0.19.1
 prance==23.6.21.0
 PyJWT==2.8.0
-requests==2.32.1
+requests==2.32.3
 serverless_wsgi==3.0.4
 shapely==2.0.4
 strict-rfc3339==0.7

diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt
@@ -1 +1 @@
-boto3==1.34.109
+boto3==1.34.118
diff --git a/requirements-apps-start-execution-manager.txt b/requirements-apps-start-execution-manager.txt
@@ -1,3 +1,3 @@
-boto3==1.34.109
+boto3==1.34.118
 ./lib/dynamo/
 ./lib/lambda_logging/
diff --git a/requirements-apps-start-execution-worker.txt b/requirements-apps-start-execution-worker.txt
@@ -1,2 +1,2 @@
-boto3==1.34.109
+boto3==1.34.118
 ./lib/lambda_logging/