From 91192f4e55d08c9278d8046d71fe98fecb3062f2 Mon Sep 17 00:00:00 2001
From: Andrew Johnston <asjohnston@alaska.edu>
Date: Fri, 28 Feb 2025 10:14:06 -0900
Subject: [PATCH 1/3] add ARIA_S1_GUNW job type to hyp3-edc-prod deployment

---
 .github/workflows/deploy-daac.yml | 1 +
 CHANGELOG.md                      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-daac.yml b/.github/workflows/deploy-daac.yml
index c362d6cbb..29f136c43 100644
--- a/.github/workflows/deploy-daac.yml
+++ b/.github/workflows/deploy-daac.yml
@@ -29,6 +29,7 @@ jobs:
               job_spec/INSAR_GAMMA.yml
               job_spec/RTC_GAMMA.yml
               job_spec/INSAR_ISCE_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: 1500
             expanded_max_vcpus: 3000
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 502eab7ad..6176b1032 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [9.5.2]
 
-## Fixed
-- OPERA-DIST-S1 job spec had wrong CLI interface (e.g. --n-lookbacks should be --n_lookbacks).
+## Added
+- The `ARIA_S1_GUNW` job type is now available in the hyp3-edc-prod deployment.
 
 ## Changed
 - OPERA-DIST-S1 runtime increases from 3 to 6 hours for experimentation.
 
+## Fixed
+- OPERA-DIST-S1 job spec had wrong CLI interface (e.g. --n-lookbacks should be --n_lookbacks).
 
 ## [9.5.1]
 

From 22e34a5ece003f552f69f60f3f2583f16c058a40 Mon Sep 17 00:00:00 2001
From: Andrew Johnston <asjohnston@alaska.edu>
Date: Fri, 28 Feb 2025 14:27:02 -0900
Subject: [PATCH 2/3] remove obsolete ESA env vars for dockerizedtopsapp;
 update aria_s1_gunw example job

---
 job_spec/ARIA_S1_GUNW.yml | 13 ++++---------
 job_spec/INSAR_ISCE.yml   |  2 --
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/job_spec/ARIA_S1_GUNW.yml b/job_spec/ARIA_S1_GUNW.yml
index 3e39dca95..19a10ceb0 100644
--- a/job_spec/ARIA_S1_GUNW.yml
+++ b/job_spec/ARIA_S1_GUNW.yml
@@ -10,9 +10,8 @@ ARIA_S1_GUNW:
         minItems: 1
         maxItems: 3
         example:
-          - S1A_IW_SLC__1SDV_20250127T010136_20250127T010203_057623_07199D_4B63
-          - S1A_IW_SLC__1SDV_20250127T010111_20250127T010138_057623_07199D_4E88
-          - S1A_IW_SLC__1SDV_20250127T010045_20250127T010113_057623_07199D_4D3B
+          - S1A_IW_SLC__1SSV_20141127T015250_20141127T015318_003461_0040D8_A29D
+          - S1A_IW_SLC__1SSV_20141127T015314_20141127T015342_003461_0040D8_87BA
         items:
           description: The names of the Sentinel-1 SLC granules to use as reference scenes for InSAR processing
           type: string
@@ -26,9 +25,7 @@ ARIA_S1_GUNW:
         minItems: 1
         maxItems: 3
         example:
-          - S1A_IW_SLC__1SDV_20250103T010137_20250103T010204_057273_070BB6_CD45
-          - S1A_IW_SLC__1SDV_20250103T010113_20250103T010140_057273_070BB6_1133
-          - S1A_IW_SLC__1SDV_20250103T010047_20250103T010115_057273_070BB6_99C5
+          - S1A_IW_SLC__1SSV_20141103T015256_20141103T015323_003111_00391A_3776
         items:
           description: The names of the Sentinel-1 SLC granules to use as secondary scenes for InSAR processing
           type: string
@@ -42,7 +39,7 @@ ARIA_S1_GUNW:
         type: integer
         minimum: 0
         maximum: 27397
-        example: 23474
+        example: 9859
   cost_profiles:
     EDC:
       cost: 60.0
@@ -93,8 +90,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
index 483582196..b6d4823c1 100644
--- a/job_spec/INSAR_ISCE.yml
+++ b/job_spec/INSAR_ISCE.yml
@@ -125,8 +125,6 @@ INSAR_ISCE:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
-        - ESA_USERNAME
-        - ESA_PASSWORD
     - name: TROPOSPHERE
       image: ghcr.io/dbekaert/raider
       command:

From 65f03131d9daf11bc0d972137f48951b8d67a507 Mon Sep 17 00:00:00 2001
From: Andrew Johnston <asjohnston@alaska.edu>
Date: Fri, 28 Feb 2025 14:32:35 -0900
Subject: [PATCH 3/3] remove esa env vars from the correct task

---
 job_spec/ARIA_S1_GUNW.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/job_spec/ARIA_S1_GUNW.yml b/job_spec/ARIA_S1_GUNW.yml
index 19a10ceb0..1ec5839e0 100644
--- a/job_spec/ARIA_S1_GUNW.yml
+++ b/job_spec/ARIA_S1_GUNW.yml
@@ -70,8 +70,6 @@ ARIA_S1_GUNW:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
-        - ESA_USERNAME
-        - ESA_PASSWORD
     - name: TROPOSPHERE
       image: ghcr.io/dbekaert/raider
       command:
@@ -90,6 +88,8 @@ ARIA_S1_GUNW:
       secrets:
         - EARTHDATA_USERNAME
         - EARTHDATA_PASSWORD
+        - ESA_USERNAME
+        - ESA_PASSWORD
     - name: PUBLISH
       image: ghcr.io/asfhyp3/ingest-adapter
       command: