From ae83be570f2dc5bf2ebd82543117047b1a4a95cd Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Mon, 30 Oct 2023 14:11:47 -0800 Subject: [PATCH] pass ESA credentials to tasks using hyp3lib.get_orb.downloadSentinelOrbitFile --- job_spec/AUTORIFT.yml | 2 ++ job_spec/AUTORIFT_ITS_LIVE.yml | 2 ++ job_spec/AUTORIFT_ITS_LIVE_TEST.yml | 2 ++ job_spec/INSAR_GAMMA.yml | 2 ++ job_spec/INSAR_ISCE.yml | 4 ++++ job_spec/INSAR_ISCE_BURST.yml | 2 ++ job_spec/INSAR_ISCE_TEST.yml | 4 ++++ job_spec/RIVER_WIDTH.yml | 5 ++--- job_spec/RTC_GAMMA.yml | 2 ++ job_spec/S1_CORRECTION_ITS_LIVE.yml | 2 ++ job_spec/WATER_MAP.yml | 2 ++ job_spec/WATER_MAP_EQ.yml | 2 ++ job_spec/WATER_MAP_TEST.yml | 2 ++ 13 files changed, 30 insertions(+), 3 deletions(-) diff --git a/job_spec/AUTORIFT.yml b/job_spec/AUTORIFT.yml index 5f898a55a..96028de0d 100644 --- a/job_spec/AUTORIFT.yml +++ b/job_spec/AUTORIFT.yml @@ -55,3 +55,5 @@ AUTORIFT: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/AUTORIFT_ITS_LIVE.yml b/job_spec/AUTORIFT_ITS_LIVE.yml index e60b05f14..d2d802328 100644 --- a/job_spec/AUTORIFT_ITS_LIVE.yml +++ b/job_spec/AUTORIFT_ITS_LIVE.yml @@ -58,3 +58,5 @@ AUTORIFT: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/AUTORIFT_ITS_LIVE_TEST.yml b/job_spec/AUTORIFT_ITS_LIVE_TEST.yml index 04a2088ea..b4d11c34a 100644 --- a/job_spec/AUTORIFT_ITS_LIVE_TEST.yml +++ b/job_spec/AUTORIFT_ITS_LIVE_TEST.yml @@ -59,3 +59,5 @@ AUTORIFT_TEST: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/INSAR_GAMMA.yml b/job_spec/INSAR_GAMMA.yml index afe5edc66..f94228bbe 100644 --- a/job_spec/INSAR_GAMMA.yml +++ b/job_spec/INSAR_GAMMA.yml @@ -109,3 +109,5 @@ INSAR_GAMMA: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/INSAR_ISCE.yml b/job_spec/INSAR_ISCE.yml index 2e7c254c8..61837c4e1 100644 --- a/job_spec/INSAR_ISCE.yml +++ b/job_spec/INSAR_ISCE.yml @@ -92,6 +92,8 @@ INSAR_ISCE: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD - name: TROPOSPHERE image: ghcr.io/dbekaert/raider command: @@ -109,6 +111,8 @@ 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_BURST.yml b/job_spec/INSAR_ISCE_BURST.yml index 854849278..90fadf7b4 100644 --- a/job_spec/INSAR_ISCE_BURST.yml +++ b/job_spec/INSAR_ISCE_BURST.yml @@ -61,3 +61,5 @@ INSAR_ISCE_BURST: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/INSAR_ISCE_TEST.yml b/job_spec/INSAR_ISCE_TEST.yml index 70ccfe78a..62d8605d8 100644 --- a/job_spec/INSAR_ISCE_TEST.yml +++ b/job_spec/INSAR_ISCE_TEST.yml @@ -93,6 +93,8 @@ INSAR_ISCE_TEST: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD - name: TROPOSPHERE image: ghcr.io/dbekaert/raider image_tag: test @@ -111,6 +113,8 @@ INSAR_ISCE_TEST: 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/RIVER_WIDTH.yml b/job_spec/RIVER_WIDTH.yml index ed44fc3bf..b23b7a79f 100644 --- a/job_spec/RIVER_WIDTH.yml +++ b/job_spec/RIVER_WIDTH.yml @@ -65,6 +65,8 @@ RIVER_WIDTH: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD - name: WATER_MAP image: ghcr.io/asfhyp3/asf-tools command: @@ -77,9 +79,6 @@ RIVER_WIDTH: timeout: 36000 vcpu: 1 memory: 126000 - secrets: - - EARTHDATA_USERNAME - - EARTHDATA_PASSWORD - name: '' image: 845172464411.dkr.ecr.us-west-2.amazonaws.com/asfhyp3/riverwidthsar command: diff --git a/job_spec/RTC_GAMMA.yml b/job_spec/RTC_GAMMA.yml index 130045d7d..6842052d1 100644 --- a/job_spec/RTC_GAMMA.yml +++ b/job_spec/RTC_GAMMA.yml @@ -131,3 +131,5 @@ RTC_GAMMA: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/S1_CORRECTION_ITS_LIVE.yml b/job_spec/S1_CORRECTION_ITS_LIVE.yml index f9c321cb5..25ee95156 100644 --- a/job_spec/S1_CORRECTION_ITS_LIVE.yml +++ b/job_spec/S1_CORRECTION_ITS_LIVE.yml @@ -49,3 +49,5 @@ S1_CORRECTION_TEST: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD diff --git a/job_spec/WATER_MAP.yml b/job_spec/WATER_MAP.yml index 1c7b3d9ae..bb5d9a8a3 100644 --- a/job_spec/WATER_MAP.yml +++ b/job_spec/WATER_MAP.yml @@ -137,6 +137,8 @@ WATER_MAP: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD - name: '' image: ghcr.io/asfhyp3/asf-tools command: diff --git a/job_spec/WATER_MAP_EQ.yml b/job_spec/WATER_MAP_EQ.yml index d29496dc1..9be1ec357 100644 --- a/job_spec/WATER_MAP_EQ.yml +++ b/job_spec/WATER_MAP_EQ.yml @@ -94,6 +94,8 @@ WATER_MAP_EQ: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD - name: '' image: 845172464411.dkr.ecr.us-west-2.amazonaws.com/water-map-equal-percent-solution command: diff --git a/job_spec/WATER_MAP_TEST.yml b/job_spec/WATER_MAP_TEST.yml index f404fbee5..ca5b83227 100644 --- a/job_spec/WATER_MAP_TEST.yml +++ b/job_spec/WATER_MAP_TEST.yml @@ -152,6 +152,8 @@ WATER_MAP_TEST: secrets: - EARTHDATA_USERNAME - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD - name: '' image: ghcr.io/asfhyp3/asf-tools command: