Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/deploy-custom-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
job_spec/AK_FIRE_SAFE.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: 640 # Max: 10,406
expanded_max_vcpus: 640 # Max: 10,406
default_max_vcpus: 640
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
Expand All @@ -61,8 +61,8 @@ jobs:
job_files: >-
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: 640 # Max: 10,406
expanded_max_vcpus: 640 # Max: 10,406
default_max_vcpus: 640
expanded_max_vcpus: 640
required_surplus: 0
security_environment: ASF
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
Expand All @@ -71,7 +71,7 @@ jobs:
domain: hyp3-volcsarvatory.asf.alaska.edu
template_bucket: cf-templates-1uzy61g1h6omf-us-west-2
image_tag: latest
product_lifetime_in_days: 365000
product_lifetime_in_days: 30
default_credits_per_user: 0
default_application_status: APPROVED
cost_profile: DEFAULT
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/deploy-custom-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
job_spec/ARIA_S1_COSEIS.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: 640
expanded_max_vcpus: 640
default_max_vcpus: 640 # Max: 13000
expanded_max_vcpus: 640 # Max: 13000
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
Expand All @@ -38,7 +38,7 @@ jobs:
domain: hyp3-tibet-jpl-test.asf.alaska.edu
template_bucket: cf-templates-1or0efwqffkgd-us-west-2
image_tag: test
product_lifetime_in_days: 14
product_lifetime_in_days: 30
default_credits_per_user: 0
default_application_status: APPROVED
cost_profile: DEFAULT
Expand All @@ -49,8 +49,8 @@ jobs:
job_spec/INSAR_ISCE.yml
job_spec/OPERA_DIST_S1.yml
instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge,m6idn.xlarge,m6idn.2xlarge,m6idn.4xlarge,m6idn.8xlarge
default_max_vcpus: 6400
expanded_max_vcpus: 6400
default_max_vcpus: 6400 # Max: 10316
expanded_max_vcpus: 6400 # Max: 10316
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
Expand All @@ -67,8 +67,8 @@ jobs:
job_spec/ITS_LIVE_AUTORIFT.yml
job_spec/ITS_LIVE_META.yml
instance_types: r7gd.2xlarge,r7gd.4xlarge,r7gd.8xlarge
default_max_vcpus: 640
expanded_max_vcpus: 640
default_max_vcpus: 640 # Max: 10,406
expanded_max_vcpus: 640 # Max: 10,406
required_surplus: 0
security_environment: JPL-public
ami_id: /aws/service/ecs/optimized-ami/amazon-linux-2023/arm64/recommended/image_id
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-daac-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
template_bucket: cf-templates-118mtzosmrltk-us-west-2
image_tag: latest
product_lifetime_in_days: 14
default_credits_per_user: 10000
default_credits_per_user: 8000
default_application_status: APPROVED
cost_profile: EDC
job_files: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-daac-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
template_bucket: cf-templates-118ylv0o6jp2n-us-west-2
image_tag: test
product_lifetime_in_days: 14
default_credits_per_user: 10000
default_credits_per_user: 8000
default_application_status: APPROVED
cost_profile: EDC
opera_rtc_s1_end_date: 2026-01-01
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ 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).

## [10.11.17]

### Added
- Added `--publish-bucket` parameter on `VOLCSARVATORY_MULTI_BURST` job spec.

### Changed
- Increased product lifecycle from 14 to 30 days for `hyp3-tibet-jpl-test` to match `hyp3-tibet-jpl`.
- Reduced default credits per user to 8,000 from 10,000 for the `hyp3-edc-prod` and `hyp3-edc-uat` deployments.
- Reduced product lifecycle from 365000 to 30 days for `hyp3-volcsarvatory`.

## [10.11.16]

### Fixed
Expand Down
15 changes: 14 additions & 1 deletion job_spec/VOLCSARVATORY_MULTI_BURST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ INSAR_ISCE_MULTI_BURST:
minLength: 43
maxLength: 43
example: S1_136231_IW2_20200616T022313_VV_5D11-BURST
publish_bucket:
api_schema:
description: Publish the resulting product to the VolcSARvatory S3 Bucket
type: string
nullable: true
enum:
- null
- "volcsarvatory-data"
- "volcsarvatory-data-test"
default: null
apply_water_mask:
api_schema:
description: Sets pixels over coastal and large inland waterbodies as invalid for phase unwrapping.
Expand All @@ -57,7 +67,6 @@ INSAR_ISCE_MULTI_BURST:
steps:
- name: ''
image: ghcr.io/asfhyp3/hyp3-isce2
image_tag: 3.0.1
command:
- ++process
- insar_tops_burst
Expand All @@ -73,10 +82,14 @@ INSAR_ISCE_MULTI_BURST:
- Ref::reference
- --secondary
- Ref::secondary
- --publish-bucket
- Ref::publish_bucket
timeout: 126000 # 35 hours
compute_environment: Default
vcpu: 1
memory: 4 # Memory is always overridden in the step function by set-batch-overrides
secrets:
- EARTHDATA_USERNAME
- EARTHDATA_PASSWORD
- PUBLISH_ACCESS_KEY_ID
- PUBLISH_SECRET_ACCESS_KEY