From 4b68723f60534bd7efe896a5de9161e0abf6ebef Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 2 Jul 2024 08:21:35 -0800 Subject: [PATCH 1/4] Add solid earth autorift jobs for ARIA project --- job_spec/ARIA_AUTORIFT.yml | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 job_spec/ARIA_AUTORIFT.yml diff --git a/job_spec/ARIA_AUTORIFT.yml b/job_spec/ARIA_AUTORIFT.yml new file mode 100644 index 000000000..ad3bc6e0b --- /dev/null +++ b/job_spec/ARIA_AUTORIFT.yml @@ -0,0 +1,65 @@ +AUTORIFT: + required_parameters: + - granules + parameters: + granules: + default: '""' + api_schema: + type: array + minItems: 2 + maxItems: 2 + example: + - S2B_MSIL1C_20200105T152259_N0208_R039_T13CES_20200105T181230 + - S2B_MSIL1C_20200315T152259_N0209_R039_T13CES_20200315T181115 + items: + anyOf: + - description: The name of the Sentinel-1 SLC granule to process + type: string + pattern: "^S1[AB]_IW_SLC__1S[SD][VH]" + minLength: 67 + maxLength: 67 + example: S1A_IW_SLC__1SSV_20150621T120220_20150621T120232_006471_008934_72D8 + - description: The name of the Sentinel-2 granule to process (ESA naming convention) + type: string + pattern: "^S2[AB]_MSIL1C_" + minLength: 60 + maxLength: 60 + example: S2A_MSIL1C_20200627T150921_N0209_R025_T22WEB_20200627T170912 + - description: The name of the Landsat 4, 5, 7, 8 or 9 Collection 2 granule to process + type: string + pattern: "^L([CO]0[89]|E07|T0[45])_L1" + minLength: 40 + maxLength: 40 + example: LC08_L1GT_118112_20210107_20210107_02_T2 + bucket_prefix: + default: '""' + parameter_file: + api_schema: + description: Shapefile for determining the correct search parameters by geographic location. Path to shapefile must be understood by GDAL. + type: string + default: '/vsicurl/http://its-live-data.s3.amazonaws.com/autorift_parameters/v001/autorift_solidearth_0120m.shp' + cost_profiles: + DEFAULT: + cost: 1.0 + validators: [] + tasks: + - name: '' + image: ghcr.io/asfhyp3/hyp3-autorift + command: + - --bucket + - '!Ref Bucket' + - --bucket-prefix + - Ref::bucket_prefix + - --parameter-file + - Ref::parameter_file + - --naming-scheme + - ITS_LIVE_OD + - Ref::granules + timeout: 10800 + vcpu: 1 + memory: 31500 + secrets: + - EARTHDATA_USERNAME + - EARTHDATA_PASSWORD + - ESA_USERNAME + - ESA_PASSWORD From 1a0231b882004df83a0b9bbef1262f347e9ec4ca Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 2 Jul 2024 10:27:17 -0800 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1cade0e8..dfe919c7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [7.7.0] +### Added +- `ARIA_AUTORIFT.yml` job spec for Sold Earth offset tracking in the ARIA JPL deployments + ### Changed - Increased throughput for `hyp3-a19-jpl` (0 -> 4,000 vCPUs) to support continued processing of ARIA GUNW products. - The `hyp3-a19-jpl` and `hyp3-nisar-jpl` deployments now use the `m6id[n]` instance families to reduce the high number of spot interruptions seen with wth `c6id` instance family. From 5dac8346eeb98a69733c9e63e5303fde6545bdd2 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 2 Jul 2024 10:28:29 -0800 Subject: [PATCH 3/4] Add autorift for ARIA JPL deployments --- .github/workflows/deploy-enterprise-test.yml | 1 + .github/workflows/deploy-enterprise.yml | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-enterprise-test.yml b/.github/workflows/deploy-enterprise-test.yml index e369d0dee..339d5c678 100644 --- a/.github/workflows/deploy-enterprise-test.yml +++ b/.github/workflows/deploy-enterprise-test.yml @@ -47,6 +47,7 @@ jobs: default_application_status: APPROVED cost_profile: DEFAULT job_files: >- + job_spec/ARIA_AUTORIFT.yml job_spec/ARIA_RAIDER.yml job_spec/INSAR_ISCE.yml instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge diff --git a/.github/workflows/deploy-enterprise.yml b/.github/workflows/deploy-enterprise.yml index e788b710e..73c44e088 100644 --- a/.github/workflows/deploy-enterprise.yml +++ b/.github/workflows/deploy-enterprise.yml @@ -42,6 +42,7 @@ jobs: default_application_status: APPROVED cost_profile: DEFAULT job_files: >- + job_spec/ARIA_AUTORIFT.yml job_spec/ARIA_RAIDER.yml job_spec/INSAR_ISCE.yml instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge @@ -61,6 +62,7 @@ jobs: default_application_status: APPROVED cost_profile: DEFAULT job_files: >- + job_spec/ARIA_AUTORIFT.yml job_spec/ARIA_RAIDER.yml job_spec/INSAR_ISCE.yml instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge @@ -79,7 +81,10 @@ jobs: default_credits_per_user: 0 default_application_status: APPROVED cost_profile: DEFAULT - job_files: job_spec/INSAR_ISCE.yml + job_files: >- + job_spec/ARIA_AUTORIFT.yml + job_spec/ARIA_RAIDER.yml + job_spec/INSAR_ISCE.yml instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge default_max_vcpus: 1600 # Max 1652 expanded_max_vcpus: 1600 # Max 1652 From 660333905ea47d9048726cc93b8c4b49d1d5cb31 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 2 Jul 2024 11:08:18 -0800 Subject: [PATCH 4/4] Update CHANGELOG.md Co-authored-by: Jake Herrmann --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfe919c7a..22b8f6208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [7.7.0] ### Added -- `ARIA_AUTORIFT.yml` job spec for Sold Earth offset tracking in the ARIA JPL deployments +- `ARIA_AUTORIFT.yml` job spec for Solid Earth offset tracking in the ARIA JPL deployments ### Changed - Increased throughput for `hyp3-a19-jpl` (0 -> 4,000 vCPUs) to support continued processing of ARIA GUNW products.