Fixed deployment name clash for a3-megagpu and a3-ultragpu

Author: simrankaurb

tools/cloud-build/daily-tests/tests/ml-a3-megagpu-slurm-ubuntu.yml

@@ -16,8 +16,8 @@
 
 # region, zone must be defined in build file with --extra-vars flag!
 test_name: a3m-slurm
-deployment_name: a3m-slurm-{{ build }}
-slurm_cluster_name: "a3m{{ build[0:4] }}"
+deployment_name: a3m-{{ build[0:3] }}{{ build[-3:] }}-slurm
+slurm_cluster_name: "a3m{{ build[0:3] }}{{ build[-3:] }}"
 workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-megagpu-8g/a3mega-slurm-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-login-*"

tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-jbvms.yml

@@ -16,13 +16,13 @@
 
 # region, zone must be defined in build file with --extra-vars flag!
 test_name: a3u-jbvms
-deployment_name: a3u-jbvms-{{ build }}
+deployment_name: a3u-{{ build[0:3] }}{{ build[-3:] }}-jbvms
 hostname_prefix: "{{ deployment_name }}-beowulf"
 workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-ultragpu-8g/a3ultra-vm.yaml"
 region: europe-west1
 zone: europe-west1-b
-network: "{{ test_name }}-net-0"
+network: "{{ deployment_name }}-net-0"
 remote_node: "{{ hostname_prefix }}-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
@@ -36,4 +36,4 @@ cli_deployment_vars:
   disk_size_gb: 200
   a3u_reservation_name: hpc-exr-2
   a3u_provisioning_model: RESERVATION_BOUND
-  base_network_name: "{{ test_name }}"
+  base_network_name: "{{ deployment_name }}"

tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-slurm.yml

@@ -16,15 +16,15 @@
 
 # region, zone must be defined in build file with --extra-vars flag!
 test_name: a3u-slurm
-deployment_name: a3u-slurm-{{ build }}
-slurm_cluster_name: "a3u{{ build[0:4] }}"
+deployment_name: a3u-{{ build[0:3] }}{{ build[-3:] }}-slurm
+slurm_cluster_name: "a3u{{ build[0:3] }}{{ build[-3:] }}"
 workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-ultragpu-8g/a3ultra-slurm-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
 region: europe-west1
 zone: europe-west1-b
-network: "{{ test_name }}-net-0"
+network: "{{ deployment_name }}-net-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
 - test-validation/test-partitions.yml
@@ -49,4 +49,4 @@ cli_deployment_vars:
   disk_size_gb: 200
   a3u_cluster_size: 2
   a3u_reservation_name: hpc-exr-2
-  base_network_name: "{{ test_name }}"
+  base_network_name: "{{ deployment_name }}"