Clean region variable for tests

nebius · Nov 21, 2024 · 26de355 · 26de355
1 parent 5a18cda
commit 26de355
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 22 deletions.
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -39,6 +39,7 @@ jobs:
 
     env:
       TF_VAR_subnet_id: vpcsubnet-e00dgdntmhgkeej1z3
+      TF_VAR_region: eu-north1
       TF_VAR_loki_access_key_id: ${{ secrets.SA_ACCESS_KEY_ID }}
       TF_VAR_loki_secret_key: ${{ secrets.SA_SECRET_KEY }}
 

diff --git a/k8s-inference/tests/main.tftest.hcl b/k8s-inference/tests/main.tftest.hcl
@@ -6,7 +6,6 @@ run "k8s_inference_apply" {
     ]
   }
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
   }
 }
@@ -20,15 +19,13 @@ run "k8s_node_groups_inference_apply" {
     ]
   }
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
   }
 }
 
 run "full_inference_apply" {
   command = apply
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
   }
 }
@@ -37,7 +34,6 @@ run "test_mode_k8s_inference_apply" {
   command = apply
 
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
     test_mode         = true
   }

diff --git a/k8s-training/tests/k8s-training-kuberay.tftest.hcl b/k8s-training/tests/k8s-training-kuberay.tftest.hcl
@@ -6,7 +6,6 @@ run "k8s_training_kuberay_apply" {
     ]
   }
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
   }
 }
@@ -20,7 +19,6 @@ run "k8s_node_groups_training_kuberay_apply" {
     ]
   }
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
   }
 }
@@ -29,7 +27,6 @@ run "full_training_kuberay_apply" {
   command = apply
 
   variables {
-    region            = "eu-north1"
     etcd_cluster_size = 1
     enable_loki       = false # TODO: Disabling Loki since not possible to delete non-empty storage bucket
     enable_kuberay    = true

diff --git a/k8s-training/tests/main.tftest.hcl b/k8s-training/tests/main.tftest.hcl
@@ -1,11 +1,6 @@
 run "k8s_training_apply" {
   command = apply
 
-  variables {
-    region      = "eu-north1"
-    enable_loki = false # TODO: Disabling Loki since not possible to delete non-empty storage bucket
-  }
-
   plan_options {
     target = [
       nebius_mk8s_v1_cluster.k8s-cluster
@@ -16,11 +11,6 @@ run "k8s_training_apply" {
 run "k8s_node_groups_training_apply" {
   command = apply
 
-  variables {
-    region      = "eu-north1"
-    enable_loki = false # TODO: Disabling Loki since not possible to delete non-empty storage bucket
-  }
-
   plan_options {
     target = [
       nebius_mk8s_v1_node_group.cpu-only,
@@ -33,7 +23,6 @@ run "full_training_apply" {
   command = apply
 
   variables {
-    region      = "eu-north1"
     enable_loki = false # TODO: Disabling Loki since not possible to delete non-empty storage bucket
   }
 }
@@ -42,7 +31,6 @@ run "test_mode_k8s_training_apply" {
   command = apply
 
   variables {
-    region      = "eu-north1"
     enable_loki = false # TODO: Disabling Loki since not possible to delete non-empty storage bucket
     test_mode   = true
   }

diff --git a/slurm/tests/main.tftest.hcl b/slurm/tests/main.tftest.hcl
@@ -2,7 +2,6 @@ run "slurm_master_apply" {
   command = apply
 
   variables {
-    region                = "eu-north1"
     cluster_workers_count = 2
   }
 
@@ -17,7 +16,6 @@ run "slurm_full_apply" {
   command = apply
 
   variables {
-    region                = "eu-north1"
     cluster_workers_count = 2
   }
 }
@@ -26,7 +24,6 @@ run "test_mode_slurm_apply" {
   command = apply
 
   variables {
-    region                = "eu-north1"
     cluster_workers_count = 2
     test_mode             = true
   }