readd upgrade tests

nebari-dev · Nov 5, 2024 · 2c1608a · 2c1608a
1 parent b7c4d54
commit 2c1608a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 25 deletions.
diff --git a/...pgrade/qhub-config-do-310-customauth.yaml → ...grade/qhub-config-aws-310-customauth.yaml b/...pgrade/qhub-config-do-310-customauth.yaml → ...grade/qhub-config-aws-310-customauth.yaml
@@ -1,6 +1,6 @@
-project_name: do-pytest
-provider: do
-domain: do.nebari.dev
+project_name: aws-pytest
+provider: aws
+domain: aws.nebari.dev
 certificate:
   type: self-signed
 security:
@@ -48,22 +48,31 @@ theme:
 terraform_state:
   type: remote
 namespace: dev
-digital_ocean:
-  region: nyc3
-  kubernetes_version: 1.21.5-do.0
+amazon_web_services:
+  kubernetes_version: '1.20'
+  region: us-east-1
   node_groups:
     general:
-      instance: s-2vcpu-4gb
+      instance: m5.2xlarge
       min_nodes: 1
       max_nodes: 1
+      gpu: false
+      single_subnet: false
+      permissions_boundary:
     user:
-      instance: g-2vcpu-8gb
-      min_nodes: 1
+      instance: m5.xlarge
+      min_nodes: 0
       max_nodes: 5
+      gpu: false
+      single_subnet: false
+      permissions_boundary:
     worker:
-      instance: g-2vcpu-8gb
-      min_nodes: 1
+      instance: m5.xlarge
+      min_nodes: 0
       max_nodes: 5
+      gpu: false
+      single_subnet: false
+      permissions_boundary:
 profiles:
   jupyterlab:
   - display_name: Small Instance

diff --git a/...files-for-upgrade/qhub-config-do-310.yaml → ...iles-for-upgrade/qhub-config-aws-310.yaml b/...files-for-upgrade/qhub-config-do-310.yaml → ...iles-for-upgrade/qhub-config-aws-310.yaml
@@ -1,6 +1,6 @@
-project_name: do-pytest
-provider: do
-domain: do.nebari.dev
+project_name: aws-pytest
+provider: aws
+domain: aws.nebari.dev
 certificate:
   type: self-signed
 security:
@@ -45,22 +45,31 @@ theme:
 terraform_state:
   type: remote
 namespace: dev
-digital_ocean:
-  region: nyc3
-  kubernetes_version: 1.21.5-do.0
+amazon_web_services:
+  kubernetes_version: '1.20'
+  region: us-east-1
   node_groups:
     general:
-      instance: s-2vcpu-4gb
+      instance: m5.2xlarge
       min_nodes: 1
       max_nodes: 1
+      gpu: false
+      single_subnet: false
+      permissions_boundary:
     user:
-      instance: g-2vcpu-8gb
-      min_nodes: 1
+      instance: m5.xlarge
+      min_nodes: 0
       max_nodes: 5
+      gpu: false
+      single_subnet: false
+      permissions_boundary:
     worker:
-      instance: g-2vcpu-8gb
-      min_nodes: 1
+      instance: m5.xlarge
+      min_nodes: 0
       max_nodes: 5
+      gpu: false
+      single_subnet: false
+      permissions_boundary:
 profiles:
   jupyterlab:
   - display_name: Small Instance

diff --git a/tests/tests_unit/test_upgrade.py b/tests/tests_unit/test_upgrade.py
@@ -25,17 +25,17 @@ def qhub_users_import_json():
     "old_qhub_config_path_str,attempt_fixes,expect_upgrade_error",
     [
         (
-            "./qhub-config-yaml-files-for-upgrade/qhub-config-do-310.yaml",
+            "./qhub-config-yaml-files-for-upgrade/qhub-config-aws-310.yaml",
             False,
             False,
         ),
         (
-            "./qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml",
+            "./qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml",
             False,
             True,
         ),
         (
-            "./qhub-config-yaml-files-for-upgrade/qhub-config-do-310-customauth.yaml",
+            "./qhub-config-yaml-files-for-upgrade/qhub-config-aws-310-customauth.yaml",
             True,
             False,
         ),