Merge pull request #533 for application specific tutorial hot-fix

nick-stroud · web-flow · commit b8106eb40a9a · 2022-09-09T11:46:42.000-07:00
Fix spack setup scripts in tutorials.
diff --git a/cmd/root.go b/cmd/root.go
@@ -34,7 +34,7 @@ HPC deployments on the Google Cloud Platform.`,
 				log.Fatalf("cmd.Help function failed: %s", err)
 			}
 		},
-		Version: "v1.4.0",
+		Version: "v1.4.1",
 	}
 )
 
diff --git a/community/modules/compute/SchedMD-slurm-on-gcp-partition/versions.tf b/community/modules/compute/SchedMD-slurm-on-gcp-partition/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-partition/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-partition/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/database/slurm-cloudsql-federation/versions.tf b/community/modules/database/slurm-cloudsql-federation/versions.tf
@@ -30,10 +30,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.1"
   }
 
   required_version = ">= 0.13.0"
diff --git a/community/modules/file-system/nfs-server/versions.tf b/community/modules/file-system/nfs-server/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/project/service-enablement/versions.tf b/community/modules/project/service-enablement/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:service-enablement/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf b/community/modules/scheduler/SchedMD-slurm-on-gcp-controller/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-controller/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-controller/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf b/community/modules/scheduler/SchedMD-slurm-on-gcp-login-node/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-login-node/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-login-node/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/cloud-batch-login-node/versions.tf b/community/modules/scheduler/cloud-batch-login-node/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:cloud-batch-login-node/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:cloud-batch-login-node/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/community/modules/scheduler/htcondor-configure/versions.tf b/community/modules/scheduler/htcondor-configure/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-configure/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-configure/v1.4.1"
   }
 
   required_version = ">= 0.13.0"
diff --git a/community/modules/scripts/wait-for-startup/versions.tf b/community/modules/scripts/wait-for-startup/versions.tf
@@ -26,7 +26,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:wait-for-startup/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/docs/tutorials/gromacs/spack-gromacs.yaml b/docs/tutorials/gromacs/spack-gromacs.yaml
@@ -113,7 +113,6 @@ deployment_groups:
           #!/bin/bash
           source /apps/spack/share/spack/setup-env.sh
           spack env activate gromacs
-          spack env loads -r
           chmod -R a+rwX /apps/spack/var/spack/environments/gromacs
           mkdir -p /apps/gromacs
           chmod a+rwx /apps/gromacs
diff --git a/docs/tutorials/openfoam/spack-openfoam.yaml b/docs/tutorials/openfoam/spack-openfoam.yaml
@@ -120,7 +120,6 @@ deployment_groups:
           #!/bin/bash
           source /apps/spack/share/spack/setup-env.sh
           spack env activate openfoam
-          spack env loads -r
           chmod -R a+rwX /apps/spack/var/spack/environments/openfoam
           mkdir -p /apps/openfoam
           chmod a+rwx /apps/openfoam
diff --git a/docs/tutorials/wrfv3/spack-wrfv3.yaml b/docs/tutorials/wrfv3/spack-wrfv3.yaml
@@ -113,7 +113,6 @@ deployment_groups:
           #!/bin/bash
           source /apps/spack/share/spack/setup-env.sh
           spack env activate wrfv3
-          spack env loads -r
           chmod -R a+rwX /apps/spack/var/spack/environments/wrfv3
           mkdir -p /apps/wrfv3
           chmod a+rwx /apps/wrfv3
diff --git a/modules/compute/vm-instance/versions.tf b/modules/compute/vm-instance/versions.tf
@@ -27,10 +27,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.4.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:vm-instance/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/file-system/filestore/versions.tf b/modules/file-system/filestore/versions.tf
@@ -26,10 +26,10 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.4.1"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:filestore/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/monitoring/dashboard/versions.tf b/modules/monitoring/dashboard/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:dashboard/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/network/pre-existing-vpc/versions.tf b/modules/network/pre-existing-vpc/versions.tf
@@ -22,7 +22,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:pre-existing-vpc/v1.4.1"
   }
 
   required_version = ">= 0.14.0"
diff --git a/modules/scripts/startup-script/versions.tf b/modules/scripts/startup-script/versions.tf
@@ -30,7 +30,7 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.4.0"
+    module_name = "blueprints/terraform/hpc-toolkit:startup-script/v1.4.1"
   }
 
   required_version = ">= 0.14.0"

Original file line number	Diff line number	Diff line change
@@ -34,7 +34,7 @@ HPC deployments on the Google Cloud Platform.`,
`34`	`34`	`log.Fatalf("cmd.Help function failed: %s", err)`
`35`	`35`	`}`
`36`	`36`	`},`
`37`		`- Version: "v1.4.0",`
	`37`	`+ Version: "v1.4.1",`
`38`	`38`	`}`
`39`	`39`	`)`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ terraform {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`provider_meta "google" {`
`25`		`- module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-partition/v1.4.0"`
	`25`	`+ module_name = "blueprints/terraform/hpc-toolkit:SchedMD-slurm-on-gcp-partition/v1.4.1"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`required_version = ">= 0.14.0"`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ terraform {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`provider_meta "google" {`
`33`		`- module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.0"`
	`33`	`+ module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.1"`
`34`	`34`	`}`
`35`	`35`	`provider_meta "google-beta" {`
`36`		`- module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.0"`
	`36`	`+ module_name = "blueprints/terraform/hpc-toolkit:slurm-cloudsql-federation/v1.4.1"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`required_version = ">= 0.13.0"`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ terraform {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`provider_meta "google" {`
`29`		`- module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.4.0"`
	`29`	`+ module_name = "blueprints/terraform/hpc-toolkit:nfs-server/v1.4.1"`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`required_version = ">= 0.14.0"`