Merge pull request #1946 from ASFHyP3/develop

Release v4.4.1

.github/workflows/deploy-daac.yml

@@ -45,7 +45,6 @@ jobs:
               job_spec/INSAR_GAMMA.yml
               job_spec/RTC_GAMMA.yml
               job_spec/INSAR_ISCE_TEST.yml
-              job_spec/WATER_MAP.yml
               job_spec/INSAR_ISCE_BURST.yml
             instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
             default_max_vcpus: 1500

CHANGELOG.md

@@ -4,6 +4,19 @@ 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).
 
+## [4.4.1]
+### Changed
+- Updated `WATER_MAP` job spec to point at the [HydroSAR images](https://github.com/fjmeyer/HydroSAR/pkgs/container/hydrosar)
+  instead of the [ASF Tools images](https://github.com/asfhyp3/asf-tools/pkgs/container/asf-tools) as the HydroSAR code
+  is being migrated to the HydroSAR project repository.
+
+### Fixed
+- Reverted the new AWS Batch job retry strategy introduced in [HyP3 v4.1.2](https://github.com/ASFHyP3/hyp3/releases/tag/v4.1.2). Fixes https://github.com/ASFHyP3/hyp3/issues/1944
+
+### Removed
+- Removed the unused `RIVER_WIDTH` job spec.
+- Removed the `WATER_MAP` job spec from UAT as it's not expected to be available in HyP3 production anytime soon.
+
 ## [4.4.0]
 ### Added
 - INSAR_ISCE_BURST job to EDC production deployment.

apps/step-function.json.j2

@@ -211,7 +211,10 @@
         "ShareIdentifier": "default",
         "SchedulingPriorityOverride.$": "$.priority",
         "Parameters.$": "$.job_parameters",
-        "ContainerOverrides.$": "$.container_overrides"
+        "ContainerOverrides.$": "$.container_overrides",
+        "RetryStrategy": {
+          "Attempts": 3
+        }
       },
       "ResultPath": "$.results.processing_results.step_{{ loop.index0 }}",
       "Next": "{% if not loop.last %}{{ loop.nextitem['name'] }}{% else %}GET_FILES{% endif %}",
@@ -223,14 +226,6 @@
           ],
           "MaxAttempts": 2
         },
-        {
-          "ErrorEquals": [
-            "States.TaskFailed"
-          ],
-          "IntervalSeconds": 600,
-          "MaxAttempts": 2,
-          "BackoffRate": 6.0
-        },
         {
           "ErrorEquals": [
             "States.ALL"

job_spec/WATER_MAP.yml

@@ -155,10 +155,10 @@ WATER_MAP:
         - ESA_USERNAME
         - ESA_PASSWORD
     - name: ''
-      image: ghcr.io/asfhyp3/asf-tools
+      image: ghcr.io/fjmeyer/hydrosar
       command:
         - ++process
-        - water_map
+        - HYDRO30
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix
@@ -177,10 +177,10 @@ WATER_MAP:
       vcpu: 1
       memory: 126000
     - name: FLOOD_MAP
-      image: ghcr.io/asfhyp3/asf-tools
+      image: ghcr.io/fjmeyer/hydrosar
       command:
         - ++process
-        - flood_map
+        - FD30
         - --bucket
         - '!Ref Bucket'
         - --bucket-prefix