Merge pull request #3440 from mr0re1/rename_sg

Rename `/community/module/internal/slurm-gcp-v6` to `slurm-gcp`
GoogleCloudPlatform · Dec 19, 2024 · 8284083 · 8284083
2 parents 069875a + 9658bbc
commit 8284083
Show file tree

Hide file tree

Showing 28 changed files with 13 additions and 12 deletions.
diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/README.md b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/README.md
@@ -74,7 +74,7 @@ modules. For support with the underlying modules, see the instructions in the
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | ../../internal/slurm-gcp-v6/instance_template | n/a |
+| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | ../../internal/slurm-gcp/instance_template | n/a |
 
 ## Resources
 

diff --git a/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/main.tf b/community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/main.tf
@@ -56,7 +56,7 @@ locals {
 }
 
 module "slurm_nodeset_template" {
-  source = "../../internal/slurm-gcp-v6/instance_template"
+  source = "../../internal/slurm-gcp/instance_template"
 
   project_id          = var.project_id
   region              = var.region

diff --git a/.../internal/slurm-gcp-v6/instance/README.md → ...les/internal/slurm-gcp/instance/README.md b/.../internal/slurm-gcp-v6/instance/README.md → ...les/internal/slurm-gcp/instance/README.md
diff --git a/...es/internal/slurm-gcp-v6/instance/main.tf → ...dules/internal/slurm-gcp/instance/main.tf b/...es/internal/slurm-gcp-v6/instance/main.tf → ...dules/internal/slurm-gcp/instance/main.tf
diff --git a/...internal/slurm-gcp-v6/instance/outputs.tf → ...es/internal/slurm-gcp/instance/outputs.tf b/...internal/slurm-gcp-v6/instance/outputs.tf → ...es/internal/slurm-gcp/instance/outputs.tf
diff --git a/...ternal/slurm-gcp-v6/instance/variables.tf → .../internal/slurm-gcp/instance/variables.tf b/...ternal/slurm-gcp-v6/instance/variables.tf → .../internal/slurm-gcp/instance/variables.tf
diff --git a/...nternal/slurm-gcp-v6/instance/versions.tf → ...s/internal/slurm-gcp/instance/versions.tf b/...nternal/slurm-gcp-v6/instance/versions.tf → ...s/internal/slurm-gcp/instance/versions.tf
diff --git a/.../slurm-gcp-v6/instance_template/README.md → ...nal/slurm-gcp/instance_template/README.md b/.../slurm-gcp-v6/instance_template/README.md → ...nal/slurm-gcp/instance_template/README.md
diff --git a/...stance_template/files/startup_sh_unlinted → ...stance_template/files/startup_sh_unlinted b/...stance_template/files/startup_sh_unlinted → ...stance_template/files/startup_sh_unlinted
diff --git a/...al/slurm-gcp-v6/instance_template/main.tf → ...ernal/slurm-gcp/instance_template/main.tf b/...al/slurm-gcp-v6/instance_template/main.tf → ...ernal/slurm-gcp/instance_template/main.tf
diff --git a/...slurm-gcp-v6/instance_template/outputs.tf → ...al/slurm-gcp/instance_template/outputs.tf b/...slurm-gcp-v6/instance_template/outputs.tf → ...al/slurm-gcp/instance_template/outputs.tf
diff --git a/...urm-gcp-v6/instance_template/variables.tf → .../slurm-gcp/instance_template/variables.tf b/...urm-gcp-v6/instance_template/variables.tf → .../slurm-gcp/instance_template/variables.tf
diff --git a/...lurm-gcp-v6/instance_template/versions.tf → ...l/slurm-gcp/instance_template/versions.tf b/...lurm-gcp-v6/instance_template/versions.tf → ...l/slurm-gcp/instance_template/versions.tf
diff --git a/...p-v6/internal_instance_template/README.md → ...-gcp/internal_instance_template/README.md b/...p-v6/internal_instance_template/README.md → ...-gcp/internal_instance_template/README.md
diff --git a/...gcp-v6/internal_instance_template/main.tf → ...rm-gcp/internal_instance_template/main.tf b/...gcp-v6/internal_instance_template/main.tf → ...rm-gcp/internal_instance_template/main.tf
diff --git a/...-v6/internal_instance_template/outputs.tf → ...gcp/internal_instance_template/outputs.tf b/...-v6/internal_instance_template/outputs.tf → ...gcp/internal_instance_template/outputs.tf
diff --git a/...6/internal_instance_template/variables.tf → ...p/internal_instance_template/variables.tf b/...6/internal_instance_template/variables.tf → ...p/internal_instance_template/variables.tf
diff --git a/...v6/internal_instance_template/versions.tf → ...cp/internal_instance_template/versions.tf b/...v6/internal_instance_template/versions.tf → ...cp/internal_instance_template/versions.tf
diff --git a/...ternal/slurm-gcp-v6/nodeset_tpu/README.md → .../internal/slurm-gcp/nodeset_tpu/README.md b/...ternal/slurm-gcp-v6/nodeset_tpu/README.md → .../internal/slurm-gcp/nodeset_tpu/README.md
diff --git a/...internal/slurm-gcp-v6/nodeset_tpu/main.tf → ...es/internal/slurm-gcp/nodeset_tpu/main.tf b/...internal/slurm-gcp-v6/nodeset_tpu/main.tf → ...es/internal/slurm-gcp/nodeset_tpu/main.tf
diff --git a/...ernal/slurm-gcp-v6/nodeset_tpu/outputs.tf → ...internal/slurm-gcp/nodeset_tpu/outputs.tf b/...ernal/slurm-gcp-v6/nodeset_tpu/outputs.tf → ...internal/slurm-gcp/nodeset_tpu/outputs.tf
diff --git a/...nal/slurm-gcp-v6/nodeset_tpu/variables.tf → ...ternal/slurm-gcp/nodeset_tpu/variables.tf b/...nal/slurm-gcp-v6/nodeset_tpu/variables.tf → ...ternal/slurm-gcp/nodeset_tpu/variables.tf
diff --git a/...rnal/slurm-gcp-v6/nodeset_tpu/versions.tf → ...nternal/slurm-gcp/nodeset_tpu/versions.tf b/...rnal/slurm-gcp-v6/nodeset_tpu/versions.tf → ...nternal/slurm-gcp/nodeset_tpu/versions.tf
diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/README.md b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/README.md
@@ -261,12 +261,12 @@ limitations under the License.
 | <a name="module_daos_network_storage_scripts"></a> [daos\_network\_storage\_scripts](#module\_daos\_network\_storage\_scripts) | ../../../../modules/scripts/startup-script | n/a |
 | <a name="module_nodeset_cleanup"></a> [nodeset\_cleanup](#module\_nodeset\_cleanup) | ./modules/cleanup_compute | n/a |
 | <a name="module_nodeset_cleanup_tpu"></a> [nodeset\_cleanup\_tpu](#module\_nodeset\_cleanup\_tpu) | ./modules/cleanup_tpu | n/a |
-| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | ../../internal/slurm-gcp-v6/instance_template | n/a |
+| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | ../../internal/slurm-gcp/instance_template | n/a |
 | <a name="module_slurm_files"></a> [slurm\_files](#module\_slurm\_files) | ./modules/slurm_files | n/a |
-| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | ../../internal/slurm-gcp-v6/instance | n/a |
-| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | ../../internal/slurm-gcp-v6/instance_template | n/a |
-| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | ../../internal/slurm-gcp-v6/instance_template | n/a |
-| <a name="module_slurm_nodeset_tpu"></a> [slurm\_nodeset\_tpu](#module\_slurm\_nodeset\_tpu) | ../../internal/slurm-gcp-v6/nodeset_tpu | n/a |
+| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | ../../internal/slurm-gcp/instance | n/a |
+| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | ../../internal/slurm-gcp/instance_template | n/a |
+| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | ../../internal/slurm-gcp/instance_template | n/a |
+| <a name="module_slurm_nodeset_tpu"></a> [slurm\_nodeset\_tpu](#module\_slurm\_nodeset\_tpu) | ../../internal/slurm-gcp/nodeset_tpu | n/a |
 
 ## Resources
 

diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/controller.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/controller.tf
@@ -43,7 +43,7 @@ locals {
 
 # INSTANCE TEMPLATE
 module "slurm_controller_template" {
-  source = "../../internal/slurm-gcp-v6/instance_template"
+  source = "../../internal/slurm-gcp/instance_template"
 
   project_id          = var.project_id
   region              = var.region

diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/login.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/login.tf
@@ -14,7 +14,7 @@
 
 # TEMPLATE
 module "slurm_login_template" {
-  source = "../../internal/slurm-gcp-v6/instance_template"
+  source = "../../internal/slurm-gcp/instance_template"
 
   for_each = { for x in var.login_nodes : x.name_prefix => x }
 
@@ -56,7 +56,7 @@ module "slurm_login_template" {
 
 # INSTANCE
 module "slurm_login_instance" {
-  source   = "../../internal/slurm-gcp-v6/instance"
+  source   = "../../internal/slurm-gcp/instance"
   for_each = { for x in var.login_nodes : x.name_prefix => x }
 
   access_config = each.value.access_config

diff --git a/...odules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/slurmsync.py b/...odules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/slurmsync.py
@@ -441,6 +441,7 @@ def delete_reservation(lkp: util.Lookup, reservation_name: str) -> None:
 def create_reservation(lkp: util.Lookup, reservation_name: str, node: str, start_time: datetime) -> None:
     # Format time to be compatible with slurm reservation.
     formatted_start_time = start_time.strftime('%Y-%m-%dT%H:%M:%S')
+
     util.run(f"{lkp.scontrol} create reservation user=slurm starttime={formatted_start_time} duration=180 nodes={node} reservationname={reservation_name} flags=maint,ignore_jobs")
 
 

diff --git a/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/partition.tf b/community/modules/scheduler/schedmd-slurm-gcp-v6-controller/partition.tf
@@ -26,7 +26,7 @@ locals {
 # NODESET
 # TODO: remove dependency on slurm-gcp repo, move to local template module
 module "slurm_nodeset_template" {
-  source   = "../../internal/slurm-gcp-v6/instance_template"
+  source   = "../../internal/slurm-gcp/instance_template"
   for_each = local.nodeset_map
 
   project_id          = var.project_id
@@ -104,7 +104,7 @@ locals {
 
 # NODESET TPU
 module "slurm_nodeset_tpu" {
-  source   = "../../internal/slurm-gcp-v6/nodeset_tpu"
+  source   = "../../internal/slurm-gcp/nodeset_tpu"
   for_each = local.nodeset_tpu_map
 
   project_id             = var.project_id