diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml index 98cdb3573..50cffb453 100644 --- a/.github/workflows/deploy-daac.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dc57e056..5afad2ddd 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/apps/step-function.json.j2 b/apps/step-function.json.j2 index 17bb8f63e..57d0c98aa 100644 --- a/apps/step-function.json.j2 +++ b/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" diff --git a/job_spec/RIVER_WIDTH.yml b/job_spec/RIVER_WIDTH.yml deleted file mode 100644 index b23b7a79f..000000000 --- a/job_spec/RIVER_WIDTH.yml +++ /dev/null @@ -1,91 +0,0 @@ -RIVER_WIDTH: - required_parameters: - - granules - parameters: - granules: - default: '""' - api_schema: - type: array - minItems: 1 - maxItems: 1 - items: - anyOf: - - description: The name of the IW VV+VH Sentinel-1 GRDH granule to process - type: string - pattern: "^S1[AB]_IW_GRDH_1SDV" - minLength: 67 - maxLength: 67 - example: S1A_IW_GRDH_1SDV_20210413T235641_20210413T235706_037439_0469D0_3F2B - - description: The name of the IW VV+VH Sentinel-1 SLC granule to process - type: string - pattern: "^S1[AB]_IW_SLC__1SDV" - minLength: 67 - maxLength: 67 - example: S1A_IW_SLC__1SDV_20211110T234815_20211110T234842_040516_04CE0A_E717 - bucket_prefix: - default: '""' - validators: - - check_dem_coverage - tasks: - - name: RTC - image: 845172464411.dkr.ecr.us-west-2.amazonaws.com/hyp3-gamma - command: - - ++process - - rtc - - ++omp-num-threads - - '16' - - --bucket - - '!Ref Bucket' - - --bucket-prefix - - Ref::bucket_prefix - - --resolution - - '10.0' - - --scale - - 'power' - - --radiometry - - 'gamma0' - - --speckle-filter - - 'false' - - --dem-matching - - 'false' - - --include-dem - - 'true' - - --include-inc-map - - 'false' - - --include-scattering-area - - 'false' - - --include-rgb - - 'true' - - --dem-name - - 'copernicus' - - Ref::granules - timeout: 36000 - vcpu: 1 - memory: 63200 - secrets: - - EARTHDATA_USERNAME - - EARTHDATA_PASSWORD - - ESA_USERNAME - - ESA_PASSWORD - - name: WATER_MAP - image: ghcr.io/asfhyp3/asf-tools - command: - - ++process - - water_map - - --bucket - - '!Ref Bucket' - - --bucket-prefix - - Ref::bucket_prefix - timeout: 36000 - vcpu: 1 - memory: 126000 - - name: '' - image: 845172464411.dkr.ecr.us-west-2.amazonaws.com/asfhyp3/riverwidthsar - command: - - --bucket - - '!Ref Bucket' - - --bucket-prefix - - Ref::bucket_prefix - timeout: 36000 - vcpu: 1 - memory: 31500 diff --git a/job_spec/WATER_MAP.yml b/job_spec/WATER_MAP.yml index 696723a88..512330dd9 100644 --- a/job_spec/WATER_MAP.yml +++ b/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