Merge pull request #2951 from ASFHyP3/develop

asjohnston-asf · web-flow · commit 05d341d1381f · 2025-10-27T13:46:17.000-08:00
Release v10.11.14
diff --git a/.github/workflows/deploy-custom-prod.yml b/.github/workflows/deploy-custom-prod.yml
@@ -77,7 +77,7 @@ jobs:
             cost_profile: DEFAULT
             job_files: >-
               job_spec/INSAR_GAMMA.yml
-              job_spec/INSAR_ISCE_BURST.yml
+              job_spec/VOLCSARVATORY_MULTI_BURST.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
@@ -120,8 +120,8 @@ jobs:
               job_spec/INSAR_ISCE.yml
               job_spec/OPERA_DIST_S1.yml
             instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
-            default_max_vcpus: 1000  # Max: 10316
-            expanded_max_vcpus: 1000  # Max: 10316
+            default_max_vcpus: 6400  # Max: 10316
+            expanded_max_vcpus: 6400  # Max: 10316
             required_surplus: 0
             security_environment: JPL-public
             ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
diff --git a/.github/workflows/deploy-custom-test.yml b/.github/workflows/deploy-custom-test.yml
@@ -49,8 +49,8 @@ jobs:
               job_spec/INSAR_ISCE.yml
               job_spec/OPERA_DIST_S1.yml
             instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
-            default_max_vcpus: 640
-            expanded_max_vcpus: 640
+            default_max_vcpus: 6400
+            expanded_max_vcpus: 6400
             required_surplus: 0
             security_environment: JPL-public
             ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
@@ -118,7 +118,7 @@ jobs:
             cost_profile: DEFAULT
             job_files: >-
               job_spec/INSAR_GAMMA.yml
-              job_spec/INSAR_ISCE_BURST.yml
+              job_spec/VOLCSARVATORY_MULTI_BURST.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-plus-prod.yml b/.github/workflows/deploy-plus-prod.yml
@@ -21,7 +21,7 @@ jobs:
             product_lifetime_in_days: 30
             default_credits_per_user: 0
             default_application_status: APPROVED
-            cost_profile: EDC # TODO: update before going public
+            cost_profile: EDC
             job_files: >-
               job_spec/AUTORIFT.yml
               job_spec/INSAR_GAMMA.yml
diff --git a/.github/workflows/deploy-plus-test.yml b/.github/workflows/deploy-plus-test.yml
@@ -21,13 +21,14 @@ jobs:
             product_lifetime_in_days: 30
             default_credits_per_user: 0
             default_application_status: APPROVED
-            cost_profile: EDC # TODO: update before going public
+            cost_profile: EDC
             job_files: >-
               job_spec/AUTORIFT.yml
               job_spec/INSAR_GAMMA.yml
               job_spec/RTC_GAMMA.yml
               job_spec/INSAR_ISCE_BURST.yml
               job_spec/INSAR_ISCE_MULTI_BURST.yml
+              job_spec/ARIA_S1_GUNW.yml
             instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
             default_max_vcpus: 10000
             expanded_max_vcpus: 10000
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ 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).
 
+## [10.11.14]
+
+### Added
+- Added ARIA_S1_GUNW job type to the `plus-test` deployment.
+- Added `VOLCSARVATORY_MULTI_BURST` job type to run multiburst jobs for `hyp3-volcsarvatory` increasing the max length burst limit.
+
+### Changed
+- Increased hyp3-tibet-jpl and hyp3-tibet-jpl-test throughput to 6400 VCPUs.
+- Removed temporary version pin for `INSAR_ISCE_MULTI_BURST` job spec introduced in HyP3 v10.11.13.
+- Changed `++process` in INSAR_ISCE_MULTI_BURST job spec to reflect changes in hyp3-isce2 v4.0.0.
+
+### Removed
+- ESA_USERNAME and ESA_PASSWORD environment variables removed in [RAiDER v0.5.5](https://github.com/dbekaert/RAiDER/releases/tag/v0.5.5)
+
 ## [10.11.13]
 
 ### Changed
diff --git a/job_spec/ARIA_RAIDER.yml b/job_spec/ARIA_RAIDER.yml
@@ -44,8 +44,6 @@ ARIA_RAIDER:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
-        - ESA_USERNAME
-        - ESA_PASSWORD
         - RAIDER_ECMWF_ERA5_UID
         - RAIDER_ECMWF_ERA5_API_KEY
         - RAIDER_HRES_EMAIL
diff --git a/job_spec/ARIA_S1_COSEIS.yml b/job_spec/ARIA_S1_COSEIS.yml
@@ -154,8 +154,6 @@ ARIA_S1_COSEIS:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
-        - ESA_USERNAME
-        - ESA_PASSWORD
         - RAIDER_ECMWF_ERA5_UID
         - RAIDER_ECMWF_ERA5_API_KEY
         - RAIDER_HRES_EMAIL
diff --git a/job_spec/ARIA_S1_GUNW.yml b/job_spec/ARIA_S1_GUNW.yml
@@ -73,8 +73,6 @@ ARIA_S1_GUNW:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
-        - ESA_USERNAME
-        - ESA_PASSWORD
     - name: PUBLISH
       image: ghcr.io/asfhyp3/ingest-adapter
       command:
diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml
@@ -152,8 +152,6 @@ INSAR_ISCE:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
-        - ESA_USERNAME
-        - ESA_PASSWORD
         - RAIDER_ECMWF_ERA5_UID
         - RAIDER_ECMWF_ERA5_API_KEY
         - RAIDER_HRES_EMAIL
diff --git a/job_spec/INSAR_ISCE_MULTI_BURST.yml b/job_spec/INSAR_ISCE_MULTI_BURST.yml
@@ -105,10 +105,9 @@ INSAR_ISCE_MULTI_BURST:
   steps:
     - name: ''
       image: ghcr.io/asfhyp3/hyp3-isce2
-      image_tag: 3.0.1
       command:
         - ++process
-        - insar_tops_burst
+        - insar_tops_multi_burst
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix
diff --git a/job_spec/VOLCSARVATORY_MULTI_BURST.yml b/job_spec/VOLCSARVATORY_MULTI_BURST.yml
@@ -0,0 +1,82 @@
+INSAR_ISCE_MULTI_BURST:
+  required_parameters:
+    - reference
+    - secondary
+  parameters:
+    reference:
+      api_schema:
+        type: array
+        minItems: 1
+        maxItems: 30
+        example:
+          - S1_136231_IW2_20200604T022312_VV_7C85-BURST
+          - S1_136232_IW2_20200604T022315_VV_7C85-BURST
+        items:
+          description: Name of the reference Sentinel-1 SLC IW burst granule to process
+          type: string
+          pattern: '^S1_\d{6}_IW\d_\d{8}T\d{6}_[VH]{2}_([\dA-F]){4}-BURST$'
+          minLength: 43
+          maxLength: 43
+          example: S1_136231_IW2_20200604T022312_VV_7C85-BURST
+    secondary:
+      api_schema:
+        type: array
+        minItems: 1
+        maxItems: 30
+        example:
+          - S1_136231_IW2_20200616T022313_VV_5D11-BURST
+          - S1_136232_IW2_20200616T022316_VV_5D11-BURST
+        items:
+          description: Name of the secondary Sentinel-1 SLC IW burst granule to process
+          type: string
+          pattern: '^S1_\d{6}_IW\d_\d{8}T\d{6}_[VH]{2}_([\dA-F]){4}-BURST$'
+          minLength: 43
+          maxLength: 43
+          example: S1_136231_IW2_20200616T022313_VV_5D11-BURST
+    apply_water_mask:
+      api_schema:
+        description: Sets pixels over coastal and large inland waterbodies as invalid for phase unwrapping.
+        default: false
+        type: boolean
+    looks:
+      api_schema:
+        description: Number of looks to take in range and azimuth
+        type: string
+        default: 20x4
+        enum:
+          - 20x4
+          - 10x2
+          - 5x1
+  cost_profiles:
+    DEFAULT:
+      cost: 1.0
+  validators:
+    - check_multi_burst_pairs
+    - check_dem_coverage
+    - check_not_antimeridian
+  steps:
+    - name: ''
+      image: ghcr.io/asfhyp3/hyp3-isce2
+      image_tag: 3.0.1
+      command:
+        - ++process
+        - insar_tops_burst
+        - --bucket
+        - '!Ref Bucket'
+        - --bucket-prefix
+        - Ref::job_id
+        - --apply-water-mask
+        - Ref::apply_water_mask
+        - --looks
+        - Ref::looks
+        - --reference
+        - Ref::reference
+        - --secondary
+        - Ref::secondary
+      timeout: 126000  # 35 hours
+      compute_environment: Default
+      vcpu: 1
+      memory: 4  # Memory is always overridden in the step function by set-batch-overrides
+      secrets:
+        - EARTHDATA_USERNAME
+        - EARTHDATA_PASSWORD
diff --git a/requirements-all.txt b/requirements-all.txt
@@ -5,15 +5,15 @@
 -r requirements-apps-disable-private-dns.txt
 -r requirements-apps-search-archive.txt
 -r requirements-apps-update-db.txt
-boto3==1.40.50
+boto3==1.40.55
 jinja2==3.1.6
-moto[dynamodb]==5.1.14
+moto[dynamodb]==5.1.15
 pytest==8.4.2
 PyYAML==6.0.3
 responses==0.25.8
-ruff==0.14.0
+ruff==0.14.1
 mypy==1.18.2
 setuptools==80.9.0
-setuptools_scm==9.2.1
+setuptools_scm==9.2.2
 openapi-spec-validator==0.7.2
-cfn-lint==1.40.1
+cfn-lint==1.40.2
diff --git a/requirements-apps-api-binary.txt b/requirements-apps-api-binary.txt
@@ -1 +1 @@
-cryptography==46.0.2
+cryptography==46.0.3
diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt
@@ -1 +1 @@
-boto3==1.40.50
+boto3==1.40.55
diff --git a/requirements-apps-get-files.txt b/requirements-apps-get-files.txt
@@ -1,2 +1,2 @@
-boto3==1.40.50
+boto3==1.40.55
 ./lib/dynamo/
diff --git a/requirements-apps-start-execution.txt b/requirements-apps-start-execution.txt
@@ -1,3 +1,3 @@
-boto3==1.40.50
+boto3==1.40.55
 ./lib/dynamo/
 ./lib/lambda_logging/
