Add ephemeral variants for nonephemeral runners

.github/canary-scale-config.yml

@@ -1,4 +1,8 @@
-# canary-scale-config.yml:
+
+# This file is generated by .github/scripts/validate_scale_config.py in test-infra
+# It defines runner types that will be provisioned by by LF Self-hosted runners
+
+# scale-config.yml:
 #   Powers what instance types are available for GHA auto-scaled
 #   runners. Runners listed here will be available as self hosted
 #   runners, configuration is directly pulled from the main branch.
@@ -33,26 +37,41 @@ runner_types:
     instance_type: m7i-flex.8xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.12xlarge:
     disk_size: 200
     instance_type: c5.12xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.10xlarge.avx2:
     disk_size: 200
     instance_type: m4.10xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.24xl.spr-metal:
     disk_size: 200
     instance_type: c7i.metal-24xl
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.16xlarge.spr:
     disk_size: 200
     instance_type: c7i.16xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.9xlarge.ephemeral:
     disk_size: 200
     instance_type: c5.9xlarge
@@ -68,11 +87,17 @@ runner_types:
     instance_type: g3.16xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.24xlarge:
     disk_size: 150
     instance_type: c5.24xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.24xlarge.ephemeral:
     disk_size: 150
     instance_type: c5.24xlarge
@@ -83,71 +108,113 @@ runner_types:
     instance_type: c5.2xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.4xlarge:
     disk_size: 150
     instance_type: c5.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.4xlarge.nvidia.gpu:
     disk_size: 150
     instance_type: g3.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.8xlarge.nvidia.gpu:
     disk_size: 150
     instance_type: g3.8xlarge
     is_ephemeral: false
     os: linux
-  c.linux.g4dn.4xlarge.nvidia.gpu:
+    variants:
+      ephemeral:
+        is_ephemeral: true
+  c.linux.g4dn.12xlarge.nvidia.gpu:
     disk_size: 150
-    instance_type: g4dn.4xlarge
+    instance_type: g4dn.12xlarge
     is_ephemeral: false
     os: linux
-  c.linux.g4dn.12xlarge.nvidia.gpu:
+    variants:
+      ephemeral:
+        is_ephemeral: true
+  c.linux.g4dn.4xlarge.nvidia.gpu:
     disk_size: 150
-    instance_type: g4dn.12xlarge
+    instance_type: g4dn.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.g4dn.metal.nvidia.gpu:
     disk_size: 150
     instance_type: g4dn.metal
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.g5.48xlarge.nvidia.gpu:
     disk_size: 150
     instance_type: g5.48xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.g5.12xlarge.nvidia.gpu:
     disk_size: 150
     instance_type: g5.12xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.g5.4xlarge.nvidia.gpu:
     disk_size: 150
     instance_type: g5.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.g6.4xlarge.experimental.nvidia.gpu:
     disk_size: 150
     instance_type: g6.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.large:
     disk_size: 15
     instance_type: c5.large
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.arm64.2xlarge:
     disk_size: 256
     instance_type: t4g.2xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.arm64.m7g.4xlarge:
     disk_size: 256
     instance_type: m7g.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.arm64.2xlarge.ephemeral:
     disk_size: 256
     instance_type: t4g.2xlarge
@@ -163,6 +230,9 @@ runner_types:
     instance_type: m7g.metal
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.windows.g4dn.xlarge:
     disk_size: 256
     instance_type: g4dn.xlarge
@@ -173,6 +243,9 @@ runner_types:
     instance_type: g4dn.xlarge
     is_ephemeral: false
     os: windows
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.windows.4xlarge:
     disk_size: 256
     instance_type: c5d.4xlarge
@@ -183,6 +256,9 @@ runner_types:
     instance_type: c5d.4xlarge
     is_ephemeral: false
     os: windows
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.windows.8xlarge.nvidia.gpu:
     disk_size: 256
     instance_type: p3.2xlarge
@@ -193,31 +269,49 @@ runner_types:
     instance_type: p3.2xlarge
     is_ephemeral: false
     os: windows
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.windows.g5.4xlarge.nvidia.gpu:
     disk_size: 256
     instance_type: g5.4xlarge
     is_ephemeral: false
     os: windows
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.2xlarge.memory:
     disk_size: 200
     instance_type: r5.2xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.4xlarge.memory:
     disk_size: 300
     instance_type: r5.4xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.8xlarge.memory:
     disk_size: 400
     instance_type: r5.8xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.12xlarge.memory:
     disk_size: 600
     instance_type: r5.12xlarge
     is_ephemeral: false
     os: linux
+    variants:
+      ephemeral:
+        is_ephemeral: true
   c.linux.12xlarge.memory.ephemeral:
     disk_size: 400
     instance_type: r5.12xlarge