use and test 2x partitions in arcus env

sjpb · sjpb · commit 90212c5dfcbd · 2022-09-27T08:03:44.000Z
diff --git a/environments/arcus/hooks/check_slurm.yml b/environments/arcus/hooks/check_slurm.yml
@@ -17,4 +17,5 @@
       <end>
   vars:
     expected_sinfo:
-      - "{{ openhpc_cluster_name }}-compute-[0-1] {{ openhpc_slurm_partitions[0].name }}* up 60-00:00:00 2 idle"
+      - "{{ openhpc_cluster_name }}-compute-[0-1] small* up 60-00:00:00 2 idle"
+      - "{{ openhpc_cluster_name }}-compute-[2-3] extra up 60-00:00:00 2 idle"
diff --git a/environments/arcus/terraform/main.tf b/environments/arcus/terraform/main.tf
@@ -31,10 +31,16 @@ module "cluster" {
             flavor: "vm.alaska.cpu.general.small"
             image: "openhpc-220830-2042.qcow2"
         }
+        extra: {
+            flavor: "vm.alaska.cpu.general.small"
+            image: "openhpc-220830-2042.qcow2"
+        }
     }
     compute_nodes = {
         compute-0: "small"
         compute-1: "small"
+        compute-2: "extra"
+        compute-3: "extra"
     }
     
     environment_root = var.environment_root

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,16 @@ module "cluster" {`
`31`	`31`	`flavor: "vm.alaska.cpu.general.small"`
`32`	`32`	`image: "openhpc-220830-2042.qcow2"`
`33`	`33`	`}`
	`34`	`+ extra: {`
	`35`	`+ flavor: "vm.alaska.cpu.general.small"`
	`36`	`+ image: "openhpc-220830-2042.qcow2"`
	`37`	`+ }`
`34`	`38`	`}`
`35`	`39`	`compute_nodes = {`
`36`	`40`	`compute-0: "small"`
`37`	`41`	`compute-1: "small"`
	`42`	`+ compute-2: "extra"`
	`43`	`+ compute-3: "extra"`
`38`	`44`	`}`
`39`	`45`
`40`	`46`	`environment_root = var.environment_root`