From 7d456ac82222bb3b41628094b5b80a84a6707126 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 27 Jun 2023 10:32:54 -0600
Subject: [PATCH 1/3] change nshm structure
---
nshms.yml | 121 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 78 insertions(+), 43 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 784b70c5..343a9cdf 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -6,66 +6,101 @@ nshms:
-
repo: nshm-alaska
tag: 2.2.1
- year: 2007
- deployments:
- development:
- instanceType: t4g.xlarge
- staging:
- instanceType: t4g.2xlarge
- # TODO: Add to production when model is stable
- # production:
- # instanceType: c7g.8xlarge
+ deployment:
+ baseHref: /ws/nshmp/alaska-2007/dynamic
+ environments:
+ development:
+ instanceType: t4g.xlarge
+ staging:
+ instanceType: t4g.2xlarge
+ # TODO: Add to production when model is stable
+ # production:
+ # instanceType: c7g.8xlarge
+ label: 2007 Alaska Dynamic Services
+ test:
+ site:
+ latitude: 61.2
+ longitude: -149
+ treeId: 4080
# Alaska 2023 NSHM
-
repo: nshm-alaska
tag: 3.a.4
- year: 2023
- deployments:
- development:
- instanceType: c7g.4xlarge
- staging:
- instanceType: c7g.8xlarge
- # TODO: Add to production when model is stable
- # production:
- # instanceType: c7g.8xlarge
+ deployment:
+ baseHref: /ws/nshmp/alaska-2023/dynamic
+ environments:
+ development:
+ instanceType: c7g.4xlarge
+ staging:
+ instanceType: c7g.8xlarge
+ # TODO: Add to production when model is stable
+ # production:
+ # instanceType: c7g.8xlarge
+ label: 2023 Alaska Dynamic Services
+ test:
+ site:
+ latitude: 61.2
+ longitude: -149
+ treeId: 4000
# CONUS 2018 NSHM
-
repo: nshm-conus
tag: 5.2.0
- year: 2018
- deployments:
- development:
- instanceType: c7g.4xlarge
- staging:
- instanceType: c7g.8xlarge
- production:
- instanceType: c7g.12xlarge
+ deployment:
+ baseHref: /ws/nshmp/conus-2018/dynamic
+ environments:
+ development:
+ instanceType: c7g.4xlarge
+ staging:
+ instanceType: c7g.8xlarge
+ production:
+ instanceType: c7g.12xlarge
+ label: 2018 Conterminous U.S. Dynamic Services
+ test:
+ site:
+ latitude: 37.75
+ longitude: -122.4
+ treeId: 2000
# CONUS 2023 NSHM
-
repo: nshm-conus
tag: 6.b.1
- year: 2023
- deployments:
- development:
- instanceType: c7g.4xlarge
- staging:
- instanceType: c7g.8xlarge
- # TODO: Add to production when model is stable
- # production:
- # instanceType: c7g.12xlarge
+ deployment:
+ baseHref: /ws/nshmp/conus-2023/dynamic
+ environments:
+ development:
+ instanceType: c7g.4xlarge
+ staging:
+ instanceType: c7g.8xlarge
+ # TODO: Add to production when model is stable
+ # production:
+ # instanceType: c7g.12xlarge
+ label: 2023 Conterminous U.S. Dynamic Services
+ test:
+ site:
+ latitude: 37.75
+ longitude: -122.4
+ treeId: 3199
# Hawaii 2021 NSHM
-
repo: nshm-hawaii
tag: 2.0.2
- year: 2021
- deployments:
- development:
- instanceType: c7g.4xlarge
- staging:
- instanceType: c7g.8xlarge
- production:
- instanceType: c7g.8xlarge
+ deployment:
+ baseHref: /ws/nshmp/hawaii-2021/dynamic
+ environments:
+ development:
+ instanceType: c7g.4xlarge
+ staging:
+ instanceType: c7g.8xlarge
+ production:
+ instanceType: c7g.8xlarge
+ label: 2021 Hawaii Dynamic Services
+ test:
+ site:
+ latitude: 21.3
+ longitude: -157.86
+ treeId: 5126
--
GitLab
From 2b1e9cf66aa4643a6abc0cf4c352fa1067a16593 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 27 Jun 2023 10:39:32 -0600
Subject: [PATCH 2/3] add model
---
nshms.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/nshms.yml b/nshms.yml
index 343a9cdf..f7b5a779 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -17,6 +17,7 @@ nshms:
# production:
# instanceType: c7g.8xlarge
label: 2007 Alaska Dynamic Services
+ model: ALASKA_2007
test:
site:
latitude: 61.2
@@ -38,6 +39,7 @@ nshms:
# production:
# instanceType: c7g.8xlarge
label: 2023 Alaska Dynamic Services
+ model: ALASKA_2023
test:
site:
latitude: 61.2
@@ -58,6 +60,7 @@ nshms:
production:
instanceType: c7g.12xlarge
label: 2018 Conterminous U.S. Dynamic Services
+ model: CONUS_2018
test:
site:
latitude: 37.75
@@ -79,6 +82,7 @@ nshms:
# production:
# instanceType: c7g.12xlarge
label: 2023 Conterminous U.S. Dynamic Services
+ model: CONUS_2023
test:
site:
latitude: 37.75
@@ -99,6 +103,7 @@ nshms:
production:
instanceType: c7g.8xlarge
label: 2021 Hawaii Dynamic Services
+ model: HAWAII_2021
test:
site:
latitude: 21.3
--
GitLab
From 65f67e6559039fc68e70675d7225f6564aa9b4c9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 27 Jun 2023 10:41:14 -0600
Subject: [PATCH 3/3] add year
---
nshms.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/nshms.yml b/nshms.yml
index f7b5a779..73c71994 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -6,6 +6,7 @@ nshms:
-
repo: nshm-alaska
tag: 2.2.1
+ year: 2007
deployment:
baseHref: /ws/nshmp/alaska-2007/dynamic
environments:
@@ -28,6 +29,7 @@ nshms:
-
repo: nshm-alaska
tag: 3.a.4
+ year: 2023
deployment:
baseHref: /ws/nshmp/alaska-2023/dynamic
environments:
@@ -50,6 +52,7 @@ nshms:
-
repo: nshm-conus
tag: 5.2.0
+ year: 2018
deployment:
baseHref: /ws/nshmp/conus-2018/dynamic
environments:
@@ -71,6 +74,7 @@ nshms:
-
repo: nshm-conus
tag: 6.b.1
+ year: 2023
deployment:
baseHref: /ws/nshmp/conus-2023/dynamic
environments:
@@ -93,6 +97,7 @@ nshms:
-
repo: nshm-hawaii
tag: 2.0.2
+ year: 2021
deployment:
baseHref: /ws/nshmp/hawaii-2021/dynamic
environments:
--
GitLab