Skip to content

Commit

Permalink
Revert "Revert #2351"
Browse files Browse the repository at this point in the history
+ fix integration tests
  • Loading branch information
mr0re1 committed May 1, 2024
1 parent 8609230 commit 9ff36b6
Show file tree
Hide file tree
Showing 46 changed files with 29 additions and 48 deletions.
1 change: 0 additions & 1 deletion community/examples/AMD/hpc-amd-slurm-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ deployment_groups:
settings:
# need at least 8 physical cores to run OpenFOAM test
machine_type: c2d-standard-16
name_prefix: login

- id: slurm_controller
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
Expand Down
1 change: 0 additions & 1 deletion community/examples/hpc-slurm-gromacs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login
enable_login_public_ips: true

- id: slurm_controller
Expand Down
1 change: 0 additions & 1 deletion community/examples/hpc-slurm-local-ssd-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n1-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion community/examples/hpc-slurm-ramble-gromacs-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion community/examples/hpc-slurm-sharedvpc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion community/examples/hpc-slurm-ubuntu2004-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login
instance_image: $(vars.slurm_image)
machine_type: n2-standard-4
enable_login_public_ips: true
1 change: 0 additions & 1 deletion community/examples/hpc-slurm6-tpu-maxtext.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ deployment_groups:
use: [network]
settings:
enable_login_public_ips: true
name_prefix: "v6tpu"
machine_type: n2-standard-16

- id: slurm_controller
Expand Down
1 change: 0 additions & 1 deletion community/examples/hpc-slurm6-tpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ deployment_groups:
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: "v6tpu"
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion community/examples/htc-slurm-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: $(vars.enable_public_ips)

Expand Down
1 change: 0 additions & 1 deletion community/examples/intel/hpc-slurm-daos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true
tags: $(vars.tags)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module "slurm_login_instance" {

access_config = each.value.access_config
add_hostname_suffix = true
hostname = "${local.slurm_cluster_name}-login-${each.key}"
hostname = "${local.slurm_cluster_name}-${each.key}"
slurm_instance_role = "login"

project_id = var.project_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ No modules.
| <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | Machine type to create. | `string` | `"c2-standard-4"` | no |
| <a name="input_metadata"></a> [metadata](#input\_metadata) | Metadata, provided as a map. | `map(string)` | `{}` | no |
| <a name="input_min_cpu_platform"></a> [min\_cpu\_platform](#input\_min\_cpu\_platform) | Specifies a minimum CPU platform. Applicable values are the friendly names of<br>CPU platforms, such as Intel Haswell or Intel Skylake. See the complete list:<br>https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform | `string` | `null` | no |
| <a name="input_name_prefix"></a> [name\_prefix](#input\_name\_prefix) | Unique name prefix for login nodes | `string` | n/a | yes |
| <a name="input_name_prefix"></a> [name\_prefix](#input\_name\_prefix) | Unique name prefix for login nodes. Automatically populated by the module id if not set.<br>If setting manually, ensure a unique value across all login groups. | `string` | n/a | yes |
| <a name="input_num_instances"></a> [num\_instances](#input\_num\_instances) | Number of instances to create. This value is ignored if static\_ips is provided. | `number` | `1` | no |
| <a name="input_on_host_maintenance"></a> [on\_host\_maintenance](#input\_on\_host\_maintenance) | Instance availability Policy. | `string` | `"MIGRATE"` | no |
| <a name="input_preemptible"></a> [preemptible](#input\_preemptible) | Allow the instance to be preempted. | `bool` | `false` | no |
Expand Down
10 changes: 9 additions & 1 deletion community/modules/scheduler/schedmd-slurm-gcp-v6-login/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,16 @@ locals {

public_access_config = [{ nat_ip = null, network_tier = null }]

# lower, replace `_` with `-`, and remove any non-alphanumeric characters
name_prefix = replace(
replace(
lower(var.name_prefix),
"_", "-"),
"/[^-a-z0-9]/", "")


login_node = {
name_prefix = var.name_prefix
name_prefix = local.name_prefix
disk_auto_delete = var.disk_auto_delete
disk_labels = merge(var.disk_labels, local.labels)
disk_size_gb = var.disk_size_gb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ spec:
requirements:
services: []
ghpc:
inject_module_id: name_prefix
has_to_be_used: true
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ variable "zone" {

variable "name_prefix" {
type = string
description = "Unique name prefix for login nodes"
description = <<-EOD
Unique name prefix for login nodes. Automatically populated by the module id if not set.
If setting manually, ensure a unique value across all login groups.
EOD
}

variable "num_instances" {
Expand Down
2 changes: 0 additions & 2 deletions docs/tutorials/gromacs/spack-gromacs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ deployment_groups:
- id: slurm_login
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login

- id: slurm_controller
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
Expand Down
1 change: 0 additions & 1 deletion docs/tutorials/hpc-slurm-qwiklabs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion docs/tutorials/openfoam/spack-openfoam.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
2 changes: 0 additions & 2 deletions docs/tutorials/wrfv3/spack-wrfv3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ deployment_groups:
- id: slurm_login
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network1]
settings:
name_prefix: login

- id: slurm_controller
source: community/modules/scheduler/schedmd-slurm-gcp-v6-controller
Expand Down
1 change: 0 additions & 1 deletion examples/cae/cae-slurm-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-8

####### Scheduler: SLURM #######
Expand Down
2 changes: 0 additions & 2 deletions examples/hcls-blueprint-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,6 @@ deployment_groups:
- id: slurm_login
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: "login"

- id: slurm_controller
source: ./community/modules/scheduler/schedmd-slurm-gcp-v6-controller
Expand Down
1 change: 0 additions & 1 deletion examples/hpc-enterprise-slurm-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network, login_sa]
settings:
name_prefix: login
instance_image: $(vars.slurm_image)
machine_type: n2-standard-4
# we recommend disabling public IPs if possible
Expand Down
1 change: 0 additions & 1 deletion examples/hpc-slurm-static-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2d-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion examples/hpc-slurm-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion examples/image-builder-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
enable_login_public_ips: true
disk_size_gb: $(vars.disk_size)
instance_image: $(vars.custom_image)
Expand Down
1 change: 0 additions & 1 deletion examples/ml-slurm-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: "login"
enable_login_public_ips: true
instance_image: $(vars.new_image)
instance_image_custom: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
enable_login_public_ips: true

- id: slurm_controller
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/hcls-v6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ zone: us-central1-c
workspace: /workspace
blueprint_yaml: "{{ workspace }}/examples/hcls-blueprint-v6.yaml"
network: "{{ deployment_name }}-net"
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
cli_deployment_vars:
region: us-central1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ blueprint_yaml: "{{ workspace }}/examples/hpc-enterprise-slurm-v6.yaml"
network: "{{ deployment_name }}-net"

# Note: Pattern matching in gcloud only supports 1 wildcard.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/htc-slurm-v6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/htc-slurm-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, a*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/lustre-slurm-v6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cli_deployment_vars:
region: "{{ region }}"
zone: "{{ zone }}"
# Note: Pattern matching in gcloud only supports 1 wildcard.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/hpc-slurm-ubuntu2004-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, centv5*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
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 @@ -30,7 +30,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/hpc-slurm-ubuntu2004-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, centv5*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-rocky8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/examples/hpc-slurm-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, a*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-ssd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/hpc-slurm-local-ssd-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, centv5*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-partitions.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/tools/validate_configs/test_configs/slurm-gcp-v6-startup-scripts.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, centv5*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-partitions.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/examples/hpc-slurm-static-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, a*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
pre_deploy_tasks:
- pre-deploy-tasks/create-reservation.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-tpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/hpc-slurm6-tpu.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, a*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-slurm-v6-tpu.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/slurm-v6-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/hpc-slurm-ubuntu2004-v6.yaml"
network: "{{ deployment_name }}-net"
# Note: Pattern matching in gcloud only supports 1 wildcard, centv5*-login-* won't work.
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
controller_node: "{{ slurm_cluster_name }}-controller"
post_deploy_tests:
- test-validation/test-mounts.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/tests/spack-gromacs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ zone: us-central1-c
workspace: /workspace
blueprint_yaml: "{{ workspace }}/community/examples/hpc-slurm-gromacs.yaml"
network: "{{ deployment_name }}-net"
login_node: "{{ slurm_cluster_name }}-login-*"
login_node: "{{ slurm_cluster_name }}-slurm-login-*"
# Image name to be used to filter logs from /var/log/messages for startup script.
image_name: "slurm-gcp-dev-hpc-rocky-linux-8-*"
controller_node: "{{ slurm_cluster_name }}-controller"
Expand Down
1 change: 0 additions & 1 deletion tools/validate_configs/test_configs/config-ssh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
1 change: 0 additions & 1 deletion tools/validate_configs/test_configs/gpu-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ deployment_groups:
use:
- network_slurm
settings:
name_prefix: login
enable_login_public_ips: true
machine_type: a2-highgpu-1g

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,4 @@ deployment_groups:
use:
- network1
settings:
name_prefix: login
enable_login_public_ips: true
1 change: 0 additions & 1 deletion tools/validate_configs/test_configs/node-groups-v6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ deployment_groups:
use:
- network
settings:
name_prefix: login
enable_login_public_ips: true

- id: slurm_controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ deployment_groups:
source: community/modules/scheduler/schedmd-slurm-gcp-v6-login
use: [network]
settings:
name_prefix: login
machine_type: n2-standard-4
enable_login_public_ips: true

Expand Down

0 comments on commit 9ff36b6

Please sign in to comment.