Revert "Fix the network name (#5315)"

laveen · laveen · commit bad2f126f793 · 2026-03-26T03:24:59.000Z
This reverts commit 8f07f2d.
diff --git a/tools/cloud-build/daily-tests/builds/h4d-vm.yaml b/tools/cloud-build/daily-tests/builds/h4d-vm.yaml
@@ -84,7 +84,6 @@ steps:
       echo "INFO: Using $${H4D_VARS_FILE} as it is for SPOT provisioning."
     fi
     bash tools/add_ttl_label.sh $${BLUEPRINT}
-    sed -i -e '/- id: cluster-net-0/,/- id: cluster-rdma-net-0/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml \
         --user=sa_106486320838376751393 \
         --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-highgpu-onspot-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-highgpu-onspot-slurm.yaml
@@ -86,7 +86,6 @@ steps:
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
 
-    sed -i -e '/- id: sysnet/,/- id: gpunets/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT} "\
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-highgpu-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-highgpu-slurm.yaml
@@ -64,7 +64,6 @@ steps:
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
 
-    sed -i -e '/- id: sysnet/,/- id: gpunets/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT} "\
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-custom-blueprint-test.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-custom-blueprint-test.yaml
@@ -26,7 +26,6 @@ tags:
 - m.vpc
 - slurm6
 
-
 timeout: 14400s  # 4hr
 steps:
 # While using static network names we are gaurding against more than 1 instance running at a time (for multi-group tests)
@@ -77,7 +76,6 @@ steps:
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
 
-    sed -i -e '/- id: a3ultra-slurm-net-0/,/- id: a3ultra-slurm-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=$${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-jbvms.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-jbvms.yaml
@@ -59,7 +59,6 @@ steps:
     sed -i -e '/deletion_protection:/{n;s/enabled: true/enabled: false/}' $${BLUEPRINT}
     sed -i -e '/reason:/d' $${BLUEPRINT}
     bash tools/add_ttl_label.sh $${BLUEPRINT}
-    sed -i -e '/- id: a3ultra-net-0/,/- id: a3ultra-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml \
         --user=sa_106486320838376751393 \
         --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-onspot-jbvms.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-onspot-jbvms.yaml
@@ -84,7 +84,6 @@ steps:
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
 
-    sed -i -e '/- id: a3ultra-net-0/,/- id: a3ultra-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml \
         --user=sa_106486320838376751393 \
         --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-onspot-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-onspot-slurm.yaml
@@ -90,7 +90,6 @@ steps:
       echo "INFO: Using $${SLURM_VARS_FILE} as it is for SPOT provisioning."
     fi
     bash tools/add_ttl_label.sh $${BLUEPRINT}
-    sed -i -e '/- id: a3ultra-slurm-net-0/,/- id: a3ultra-slurm-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=$${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-a3-ultragpu-slurm.yaml
@@ -64,7 +64,6 @@ steps:
     sed -i -e '/deletion_protection:/{n;s/enabled: true/enabled: false/}' $${BLUEPRINT}
     sed -i -e '/reason:/d' $${BLUEPRINT}
     bash tools/add_ttl_label.sh $${BLUEPRINT}
-    sed -i -e '/- id: a3ultra-slurm-net-0/,/- id: a3ultra-slurm-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
         --user=sa_106486320838376751393 \
         --extra-vars="project=${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a4-highgpu-custom-blueprint-test.yaml b/tools/cloud-build/daily-tests/builds/ml-a4-highgpu-custom-blueprint-test.yaml
@@ -26,7 +26,6 @@ tags:
 - m.vpc
 - slurm6
 
-
 timeout: 14400s  # 4hr
 steps:
 # While using static network names we are gaurding against more than 1 instance running at a time (for multi-group tests)
@@ -76,7 +75,6 @@ steps:
       echo "INFO: Using $${VARS_FILE} as it is for SPOT provisioning."
     fi
 
-    sed -i -e '/- id: a4high-slurm-net-0/,/- id: a4high-slurm-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=$${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-a4-highgpu-onspot-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-a4-highgpu-onspot-slurm.yaml
@@ -89,7 +89,6 @@ steps:
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
 
-    sed -i -e '/- id: a4high-slurm-net-0/,/- id: a4high-slurm-net-1/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=$${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-g4-onspot-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-g4-onspot-slurm.yaml
@@ -82,7 +82,6 @@ steps:
     fi
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
-    sed -i -e '/- id: net0/,/- id: homefs/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=$${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/builds/ml-h4d-onspot-slurm.yaml b/tools/cloud-build/daily-tests/builds/ml-h4d-onspot-slurm.yaml
@@ -81,7 +81,6 @@ steps:
     fi
 
     bash tools/add_ttl_label.sh $${BLUEPRINT}
-    sed -i -e '/- id: h4d-slurm-net-0/,/- id: h4d-rdma-net/ s/network_name: .*/network_name: $(vars.base_network_name)/' $${BLUEPRINT}
     ansible-playbook tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml \
       --user=sa_106486320838376751393 \
       --extra-vars="project=$${PROJECT_ID} build=$${BUILD_ID_SHORT}" \
diff --git a/tools/cloud-build/daily-tests/tests/h4d-vm.yml b/tools/cloud-build/daily-tests/tests/h4d-vm.yml
@@ -19,7 +19,7 @@ test_name: h4d-jbvms
 deployment_name: h4d-jbvms-{{ build }}
 workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/h4d-vm.yaml"
-network: "{{ test_name }}"
+network: "{{ test_name }}-net"
 remote_node: "{{ deployment_name }}-0"
 post_deploy_tests:
 - test-validation/test-irdma.yml
@@ -32,6 +32,5 @@ custom_vars:
   enable_spot: true
 cli_deployment_vars:
   test_name: '{{ test_name }}'
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-highgpu-onspot-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-a3-highgpu-onspot-slurm.yml
@@ -23,7 +23,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-highgpu-8g/a3high-slurm-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ deployment_name }}-net-0"
 nccl_test_path: "examples/machine-learning/a3-highgpu-8g/nccl-tests"
 sub_network: "{{ deployment_name }}-sub-0"
 post_deploy_tests:
@@ -46,7 +46,6 @@ custom_vars:
     a3high_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   tcpx_kernel_login: "{{ tcpx_kernel_login }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-highgpu-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-a3-highgpu-slurm.yml
@@ -23,7 +23,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-highgpu-8g/a3high-slurm-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ deployment_name }}-net-0"
 nccl_test_path: "examples/machine-learning/a3-highgpu-8g/nccl-tests"
 sub_network: "{{ deployment_name }}-sub-0"
 post_deploy_tests:
@@ -43,7 +43,6 @@ custom_vars:
   mounts:
   - /home
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   tcpx_kernel_login: "{{ tcpx_kernel_login }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-custom-blueprint-test.yml b/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-custom-blueprint-test.yml
@@ -22,7 +22,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/tools/cloud-build/daily-tests/blueprints/a3ultra-custom-image-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 nccl_test_path: "examples/machine-learning/a3-ultragpu-8g/nccl-tests"
 post_deploy_tests:
 - test-validation/test-mounts.yml
@@ -46,12 +46,12 @@ custom_vars:
     a3ultra_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   slurm_cluster_name: "{{ slurm_cluster_name }}"
   disk_size_gb: 100
   a3u_cluster_size: 2
   instance_image_project: "{{ instance_image_project }}"
   instance_image_family: "{{ instance_image_family }}"
+  base_network_name: "{{ test_name }}"
   a3u_enable_spot_vm: true
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-jbvms.yml b/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-jbvms.yml
@@ -22,7 +22,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-ultragpu-8g/a3ultra-vm.yaml"
 region: europe-west1
 zone: europe-west1-b
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 remote_node: "{{ hostname_prefix }}-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
@@ -31,8 +31,8 @@ custom_vars:
   mounts:
   - /home
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   a3u_reservation_name: hpc-exr-2
   a3u_provisioning_model: RESERVATION_BOUND
+  base_network_name: "{{ test_name }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-onspot-jbvms.yml b/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-onspot-jbvms.yml
@@ -20,7 +20,7 @@ deployment_name: a3u-spot-jbvms-{{ build }}
 hostname_prefix: "{{ deployment_name }}-beowulf"
 workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a3-ultragpu-8g/a3ultra-vm.yaml"
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 remote_node: "{{ hostname_prefix }}-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
@@ -32,7 +32,7 @@ custom_vars:
     a3ultra_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   a3u_provisioning_model: SPOT
+  base_network_name: "{{ test_name }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-onspot-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-onspot-slurm.yml
@@ -22,7 +22,7 @@ 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"
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 nccl_test_path: "examples/machine-learning/a3-ultragpu-8g/nccl-tests"
 post_deploy_tests:
 - test-validation/test-mounts.yml
@@ -46,10 +46,10 @@ custom_vars:
     a3ultra_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   slurm_cluster_name: "{{ slurm_cluster_name }}"
   disk_size_gb: 100
   a3u_cluster_size: 2
+  base_network_name: "{{ test_name }}"
   a3u_enable_spot_vm: true
diff --git a/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-a3-ultragpu-slurm.yml
@@ -24,7 +24,7 @@ login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
 region: europe-west1
 zone: europe-west1-b
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
 - test-validation/test-partitions.yml
@@ -43,10 +43,10 @@ custom_vars:
   - /home
   - /gcs
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   slurm_cluster_name: "{{ slurm_cluster_name }}"
   disk_size_gb: 100
   a3u_cluster_size: 2
   a3u_reservation_name: hpc-exr-2
+  base_network_name: "{{ test_name }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-a4-highgpu-custom-blueprint-test.yml b/tools/cloud-build/daily-tests/tests/ml-a4-highgpu-custom-blueprint-test.yml
@@ -22,7 +22,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/tools/cloud-build/daily-tests/blueprints/a4high-custom-image-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
 - test-validation/test-partitions.yml
@@ -44,11 +44,11 @@ custom_vars:
     a4high_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   slurm_cluster_name: "{{ slurm_cluster_name }}"
   disk_size_gb: 100
+  base_network_name: "{{ test_name }}"
   a4h_enable_spot_vm: true
 
   a4h_cluster_size: 2
diff --git a/tools/cloud-build/daily-tests/tests/ml-a4-highgpu-onspot-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-a4-highgpu-onspot-slurm.yml
@@ -22,7 +22,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/machine-learning/a4-highgpu-8g/a4high-slurm-blueprint.yaml"
 login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ test_name }}-net-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
 - test-validation/test-partitions.yml
@@ -44,10 +44,10 @@ custom_vars:
     a4high_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   slurm_cluster_name: "{{ slurm_cluster_name }}"
   disk_size_gb: 100
   a4h_cluster_size: 2
+  base_network_name: "{{ test_name }}"
   a4h_enable_spot_vm: true
diff --git a/tools/cloud-build/daily-tests/tests/ml-g4-onspot-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-g4-onspot-slurm.yml
@@ -22,7 +22,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/ml-slurm-g4.yaml"
 login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ deployment_name }}-net-0"
 post_deploy_tests:
 - test-validation/test-mounts.yml
 - test-validation/test-partitions.yml
@@ -41,7 +41,6 @@ custom_vars:
     g4_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"
   slurm_cluster_name: "{{ slurm_cluster_name }}"
diff --git a/tools/cloud-build/daily-tests/tests/ml-h4d-onspot-slurm.yml b/tools/cloud-build/daily-tests/tests/ml-h4d-onspot-slurm.yml
@@ -22,7 +22,7 @@ workspace: /workspace
 blueprint_yaml: "{{ workspace }}/examples/hpc-slurm-h4d/hpc-slurm-h4d.yaml"
 login_node: "{{ slurm_cluster_name }}-slurm-login-*"
 controller_node: "{{ slurm_cluster_name }}-controller"
-network: "{{ test_name }}"
+network: "{{ deployment_name }}-net"
 post_deploy_tests:
 - test-validation/test-mounts.yml
 - test-validation/test-partitions.yml
@@ -39,7 +39,6 @@ custom_vars:
     h4d_onspot: true
   enable_spot: true
 cli_deployment_vars:
-  base_network_name: '{{ test_name }}'
   deployment_name: "{{ deployment_name }}"
   region: "{{ region }}"
   zone: "{{ zone }}"
