Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion community/examples/AMD/hpc-amd-slurm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ deployment_groups:
# these images must match the images used by Slurm modules below because
# we are building OpenMPI with PMI support in libraries contained in
# Slurm installation
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public

- id: low_cost_nodeset
Expand Down
2 changes: 1 addition & 1 deletion community/examples/hpc-slurm-ubuntu2204.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ vars:
slurm_image:
# Please refer to the following link for the latest images:
# https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#supported-operating-systems
family: slurm-gcp-6-11-ubuntu-2204-lts-nvidia-570
family: slurm-gcp-6-12-ubuntu-2204-lts-nvidia-570
project: schedmd-slurm-public

deployment_groups:
Expand Down
2 changes: 1 addition & 1 deletion community/examples/hpc-slurm6-apptainer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ deployment_groups:
settings:
source_image_project_id: [schedmd-slurm-public]
# see latest in https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family
source_image_family: slurm-gcp-6-11-hpc-rocky-linux-8
source_image_family: slurm-gcp-6-12-hpc-rocky-linux-8
# You can find size of source image by using following command
# gcloud compute images describe-from-family <source_image_family> --project schedmd-slurm-public
disk_size: $(vars.disk_size)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ deployment_groups:
id: slurm_controller
settings:
instance_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
cloud_parameters:
resume_rate: 0
Expand Down Expand Up @@ -118,7 +118,7 @@ deployment_groups:
id: slurm_login
settings:
instance_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
num_instances: {{ cluster.num_login_nodes }}
subnetwork_self_link: "projects/{{ cluster.project_id }}/regions/{{ cluster.cloud_region }}/subnetworks/{{ cluster.subnet.cloud_id }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ limitations under the License.
family: {% if part.image.source_image_family == "Imported" %}{{ part.image.family }}{% else %}image-{{ part.image.family }}{% endif %}
project: {{ cluster.project_id }}
{% else %}
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
{% endif %}
{% if part.additional_disk_count > 0 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ No resources.
| <a name="input_enable_spot_vm"></a> [enable\_spot\_vm](#input\_enable\_spot\_vm) | Enable the partition to use spot VMs (https://cloud.google.com/spot-vms). | `bool` | `false` | no |
| <a name="input_feature"></a> [feature](#input\_feature) | The node feature, used to bind nodes to the nodeset. If not set, the nodeset name will be used. | `string` | `null` | no |
| <a name="input_guest_accelerator"></a> [guest\_accelerator](#input\_guest\_accelerator) | List of the type and count of accelerator cards attached to the instance. | <pre>list(object({<br/> type = string,<br/> count = number<br/> }))</pre> | `[]` | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm node group VM instances.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-11-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm node group VM instances.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-12-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image_custom"></a> [instance\_image\_custom](#input\_instance\_image\_custom) | A flag that designates that the user is aware that they are requesting<br/>to use a custom and potentially incompatible image for this Slurm on<br/>GCP module.<br/><br/>If the field is set to false, only the compatible families and project<br/>names will be accepted. The deployment will fail with any other image<br/>family or name. If set to true, no checks will be done.<br/><br/>See: https://goo.gle/hpc-slurm-images | `bool` | `false` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | Labels to add to partition compute instances. Key-value pairs. | `map(string)` | `{}` | no |
| <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | Compute Platform machine type to use for this partition compute nodes. | `string` | `"c2-standard-60"` | no |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ variable "instance_image" {
EOD
type = map(string)
default = {
family = "slurm-gcp-6-11-hpc-rocky-linux-8"
family = "slurm-gcp-6-12-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ modules. For support with the underlying modules, see the instructions in the
| <a name="input_enable_spot_vm"></a> [enable\_spot\_vm](#input\_enable\_spot\_vm) | Enable the partition to use spot VMs (https://cloud.google.com/spot-vms). | `bool` | `false` | no |
| <a name="input_future_reservation"></a> [future\_reservation](#input\_future\_reservation) | If set, will make use of the future reservation for the nodeset. Input can be either the future reservation name or its selfLink in the format 'projects/PROJECT\_ID/zones/ZONE/futureReservations/FUTURE\_RESERVATION\_NAME'.<br/>See https://cloud.google.com/compute/docs/instances/future-reservations-overview | `string` | `""` | no |
| <a name="input_guest_accelerator"></a> [guest\_accelerator](#input\_guest\_accelerator) | List of the type and count of accelerator cards attached to the instance. | <pre>list(object({<br/> type = string,<br/> count = number<br/> }))</pre> | `[]` | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm node group VM instances.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-11-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm node group VM instances.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-12-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image_custom"></a> [instance\_image\_custom](#input\_instance\_image\_custom) | A flag that designates that the user is aware that they are requesting<br/>to use a custom and potentially incompatible image for this Slurm on<br/>GCP module.<br/><br/>If the field is set to false, only the compatible families and project<br/>names will be accepted. The deployment will fail with any other image<br/>family or name. If set to true, no checks will be done.<br/><br/>See: https://goo.gle/hpc-slurm-images | `bool` | `false` | no |
| <a name="input_instance_properties"></a> [instance\_properties](#input\_instance\_properties) | Override the instance properties. Used to test features not supported by Slurm GCP,<br/>recommended for advanced usage only.<br/>See https://cloud.google.com/compute/docs/reference/rest/v1/regionInstances/bulkInsert<br/>If any sub-field (e.g. scheduling) is set, it will override the values computed by<br/>SlurmGCP and ignoring values of provided vars. | `any` | `null` | no |
| <a name="input_instance_template"></a> [instance\_template](#input\_instance\_template) | DEPRECATED: Instance template can not be specified for compute nodes. | `string` | `null` | no |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ variable "instance_image" {
EOD
type = map(string)
default = {
family = "slurm-gcp-6-11-hpc-rocky-linux-8"
family = "slurm-gcp-6-12-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ locals {
source_image_family = (
var.source_image_family != "" && var.source_image_family != null
? var.source_image_family
: "slurm-gcp-6-11-hpc-rocky-linux-8"
: "slurm-gcp-6-12-hpc-rocky-linux-8"
)
source_image_project = (
var.source_image_project != "" && var.source_image_project != null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ limitations under the License.
| <a name="input_extra_logging_flags"></a> [extra\_logging\_flags](#input\_extra\_logging\_flags) | The only available flag is `trace_api` | `map(bool)` | `{}` | no |
| <a name="input_gcloud_path_override"></a> [gcloud\_path\_override](#input\_gcloud\_path\_override) | Directory of the gcloud executable to be used during cleanup | `string` | `""` | no |
| <a name="input_guest_accelerator"></a> [guest\_accelerator](#input\_guest\_accelerator) | List of the type and count of accelerator cards attached to the instance. | <pre>list(object({<br/> type = string,<br/> count = number<br/> }))</pre> | `[]` | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm controller VM instance.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-11-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm controller VM instance.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-12-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image_custom"></a> [instance\_image\_custom](#input\_instance\_image\_custom) | A flag that designates that the user is aware that they are requesting<br/>to use a custom and potentially incompatible image for this Slurm on<br/>GCP module.<br/><br/>If the field is set to false, only the compatible families and project<br/>names will be accepted. The deployment will fail with any other image<br/>family or name. If set to true, no checks will be done.<br/><br/>See: https://goo.gle/hpc-slurm-images | `bool` | `false` | no |
| <a name="input_instance_template"></a> [instance\_template](#input\_instance\_template) | DEPRECATED: Instance template can not be specified for controller. | `string` | `null` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | Labels, provided as a map. | `map(string)` | `{}` | no |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ variable "instance_image" {
EOD
type = map(string)
default = {
family = "slurm-gcp-6-11-hpc-rocky-linux-8"
family = "slurm-gcp-6-12-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ No resources.
| <a name="input_enable_shielded_vm"></a> [enable\_shielded\_vm](#input\_enable\_shielded\_vm) | Enable the Shielded VM configuration. Note: the instance image must support option. | `bool` | `false` | no |
| <a name="input_enable_smt"></a> [enable\_smt](#input\_enable\_smt) | DEPRECATED: Use `advanced_machine_features.threads_per_core` instead. | `bool` | `null` | no |
| <a name="input_guest_accelerator"></a> [guest\_accelerator](#input\_guest\_accelerator) | List of the type and count of accelerator cards attached to the instance. | <pre>list(object({<br/> type = string,<br/> count = number<br/> }))</pre> | `[]` | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm controller VM instance.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-11-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image"></a> [instance\_image](#input\_instance\_image) | Defines the image that will be used in the Slurm controller VM instance.<br/><br/>Expected Fields:<br/>name: The name of the image. Mutually exclusive with family.<br/>family: The image family to use. Mutually exclusive with name.<br/>project: The project where the image is hosted.<br/><br/>For more information on creating custom images that comply with Slurm on GCP<br/>see the "Slurm on GCP Custom Images" section in docs/vm-images.md. | `map(string)` | <pre>{<br/> "family": "slurm-gcp-6-12-hpc-rocky-linux-8",<br/> "project": "schedmd-slurm-public"<br/>}</pre> | no |
| <a name="input_instance_image_custom"></a> [instance\_image\_custom](#input\_instance\_image\_custom) | A flag that designates that the user is aware that they are requesting<br/>to use a custom and potentially incompatible image for this Slurm on<br/>GCP module.<br/><br/>If the field is set to false, only the compatible families and project<br/>names will be accepted. The deployment will fail with any other image<br/>family or name. If set to true, no checks will be done.<br/><br/>See: https://goo.gle/hpc-slurm-images | `bool` | `false` | no |
| <a name="input_instance_template"></a> [instance\_template](#input\_instance\_template) | DEPRECATED: Instance template can not be specified for login nodes. | `string` | `null` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | Labels, provided as a map. | `map(string)` | `{}` | no |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ variable "instance_image" {
EOD
type = map(string)
default = {
family = "slurm-gcp-6-11-hpc-rocky-linux-8"
family = "slurm-gcp-6-12-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/hpc-slurm-h4d/hpc-slurm-h4d.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ vars:
zone: us-central1-a
rdma_net_range: 192.168.128.0/18
instance_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
h4d_cluster_size: 2

Expand Down
2 changes: 1 addition & 1 deletion examples/hpc-slurm-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ vars:
static_node_count: 2 ## Must be <= number of reserved machines ##

slurm_instance_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
instance_image_custom: false # true if using custom image in lines above
bandwidth_tier: gvnic_enabled
Expand Down
2 changes: 1 addition & 1 deletion examples/image-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ deployment_groups:
settings:
source_image_project_id: [schedmd-slurm-public]
# see latest in https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family
source_image_family: slurm-gcp-6-11-hpc-rocky-linux-8
source_image_family: slurm-gcp-6-12-hpc-rocky-linux-8
# You can find size of source image by using following command
# gcloud compute images describe-from-family <source_image_family> --project schedmd-slurm-public
disk_size: $(vars.disk_size)
Expand Down
2 changes: 1 addition & 1 deletion examples/ml-slurm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ deployment_groups:
omit_external_ip: false
source_image_project_id: [schedmd-slurm-public]
# see latest in https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family
source_image_family: slurm-gcp-6-11-debian-12
source_image_family: slurm-gcp-6-12-debian-12
# You can find size of source image by using following command
# gcloud compute images describe-from-family <source_image_family> --project schedmd-slurm-public
disk_size: $(vars.disk_size_gb)
Expand Down
2 changes: 1 addition & 1 deletion examples/science/af3-slurm/af3-slurm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ vars:
base_image:
project: schedmd-slurm-public
# see latest in https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
# You can find size of source image by using following command
# gcloud compute images describe-from-family <source_image_family> --project schedmd-slurm-public
image_build_machine_type: n2-standard-16
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ slurm_cluster_name: "debiv6{{ build[0:4] }}"

cli_deployment_vars:
network_name: "{{ network }}"
slurm_image: "{family: slurm-gcp-6-11-debian-12, project: schedmd-slurm-public}"
slurm_image: "{family: slurm-gcp-6-12-debian-12, project: schedmd-slurm-public}"
region: us-west4
zone: us-west4-c

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ vars:
slurm_image:
# Visit https://github.com/GoogleCloudPlatform/slurm-gcp/blob/master/docs/images.md#published-image-family
# for a list of valid family options with Slurm
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
# If image above is changed to use custom image, then setting below must be set to true
instance_image_custom: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ vars:
project_id: invalid-project
region: us-central1
slurm_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
zone: us-central1-a
deployment_groups:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ project_id = "invalid-project"
region = "us-central1"

slurm_image = {
family = "slurm-gcp-6-11-hpc-rocky-linux-8"
family = "slurm-gcp-6-12-hpc-rocky-linux-8"
project = "schedmd-slurm-public"
}

Expand Down
6 changes: 3 additions & 3 deletions tools/validate_configs/test_configs/node-groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ deployment_groups:
name: c30
machine_type: c2-standard-30
instance_image:
family: slurm-gcp-6-11-debian-12
family: slurm-gcp-6-12-debian-12
project: schedmd-slurm-public

- id: nodeset_2
Expand All @@ -73,7 +73,7 @@ deployment_groups:
name: c60
machine_type: c2-standard-60
instance_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public

- id: nodeset_3
Expand All @@ -83,7 +83,7 @@ deployment_groups:
name: cd112
machine_type: c2d-standard-112
instance_image:
family: slurm-gcp-6-11-hpc-rocky-linux-8
family: slurm-gcp-6-12-hpc-rocky-linux-8
project: schedmd-slurm-public
advanced_machine_features:
threads_per_core: null # Use platform default value
Expand Down
Loading