Skip to content

Fixing VPC Name as Test Name to limit File store network #5552

Merged
LAVEEN merged 18 commits into
GoogleCloudPlatform:developfrom
LAVEEN:testnameasvpc
Apr 25, 2026
Merged

Fixing VPC Name as Test Name to limit File store network #5552
LAVEEN merged 18 commits into
GoogleCloudPlatform:developfrom
LAVEEN:testnameasvpc

Conversation

@LAVEEN

@LAVEEN LAVEEN commented Apr 24, 2026

Copy link
Copy Markdown
Collaborator

This PR will fix the VPC names for all the tests. It would use test name as vpc name.

Submission Checklist

NOTE: Community submissions can take up to 2 weeks to be reviewed.

Please take the following actions before submitting this pull request.

  • Fork your PR branch from the Toolkit "develop" branch (not main)
  • Test all changes with pre-commit in a local branch #
  • Confirm that "make tests" passes all tests
  • Add or modify unit tests to cover code changes
  • Ensure that unit test coverage remains above 80%
  • Update all applicable documentation
  • Follow Cluster Toolkit Contribution guidelines #

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refactors the VPC naming convention used in daily integration tests to ensure better isolation and predictability. By introducing a Python utility to dynamically name VPCs based on the test name and integrating this into the build process, it prevents potential conflicts and enhances the reliability of network-dependent tests. This change streamlines the management of network resources across different test environments.

Highlights

  • Dynamic VPC Naming: Introduced a new Python script (fix_vpc_name.py) that dynamically modifies VPC network names within blueprint YAML files based on a provided test prefix and the test name. This ensures unique and consistent VPC naming for each test run.
  • Conditional Network Assignment in Ansible: Modified Ansible playbooks (base-integration-test.yml, slurm-integration-test.yml) to conditionally use a fixed VPC name (derived from test_prefix and test_name) when the use_fixed_vpc variable is set to true, otherwise falling back to the default network variable.
  • Integration into Daily Builds: Updated numerous daily test build configurations (e.g., batch-mpi.yaml, cloud-batch.yaml, various gke-h4d, h4d-vm, hcls, ml-* and slurm-gcp-v6-rocky8 YAML files) to execute the new fix_vpc_name.py script and pass the necessary test_prefix and use_fixed_vpc variables to the Ansible playbooks.
  • Test Name Variable Exposure: Added the test_name variable to the cli_deployment_vars section in various test YAML files, making it available for use in dynamic VPC naming and other CLI deployment configurations.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request implements a mechanism to use fixed VPC names during daily integration tests by introducing a tools/fix_vpc_name.py script and updating build configurations. Key feedback includes a missing configuration in ml-a3-highgpu-onspot-slurm.yaml that would lead to test failures, a style correction for the copyright header in the new Python script, and a request for consistent removal of the network_name variable across test configuration files.

Comment thread tools/fix_vpc_name.py
Comment thread tools/cloud-build/daily-tests/tests/slurm-v6-rocky8.yml
@LAVEEN LAVEEN added the release-chore To not include into release notes label Apr 24, 2026
@LAVEEN

LAVEEN commented Apr 25, 2026

Copy link
Copy Markdown
Collaborator Author

Check PR Description / check-description (pull_request)
Check PR Description / check-description (pull_request)Successful in 6s
cla/google
cla/googleSuccessful in 20s — ✅ All contributors are covered under a CLA with Google
Required
Dependency Review / dependency-review (pull_request)
Dependency Review / dependency-review (pull_request)Successful in 6s
Label External PRs / label-external (pull_request_target)
Label External PRs / label-external (pull_request_target)Successful in 5s
multi-approvers / multi-approvers / multi-approvers (pull_request)
multi-approvers / multi-approvers / multi-approvers (pull_request)Successful in 6s
Required
PR-Go-1-24-build-test (hpc-toolkit-dev)
PR-Go-1-24-build-test (hpc-toolkit-dev)Successful in 5m — Summary
Required
PR-ofe-venv (hpc-toolkit-dev)
PR-ofe-venv (hpc-toolkit-dev)Successful in 1m — Summary
PR-test-ansible-vm (hpc-toolkit-dev)
PR-test-ansible-vm (hpc-toolkit-dev)Successful in 451m — Summary
PR-test-chrome-remote-desktop (hpc-toolkit-dev)
PR-test-chrome-remote-desktop (hpc-toolkit-dev)Successful in 313m — Summary
PR-test-chrome-remote-desktop-ubuntu (hpc-toolkit-dev)
PR-test-chrome-remote-desktop-ubuntu (hpc-toolkit-dev)Successful in 629m — Summary
PR-test-e2e (hpc-toolkit-dev)
PR-test-e2e (hpc-toolkit-dev)Successful in 439m — Summary
PR-test-gcluster-dockerfile (hpc-toolkit-dev)
PR-test-gcluster-dockerfile (hpc-toolkit-dev)Successful in 391m — Summary
PR-test-gke (hpc-toolkit-dev)
PR-test-gke (hpc-toolkit-dev)Successful in 151m — Summary
PR-test-gke-a2-highgpu-kueue-onspot (hpc-toolkit-dev)
PR-test-gke-a2-highgpu-kueue-onspot (hpc-toolkit-dev)Successful in 633m — Summary
PR-test-gke-a3-highgpu-onspot (hpc-toolkit-dev)
PR-test-gke-a3-highgpu-onspot (hpc-toolkit-dev)Successful in 290m — Summary
PR-test-gke-a3-megagpu-onspot (hpc-toolkit-dev)
PR-test-gke-a3-megagpu-onspot (hpc-toolkit-dev)Successful in 208m — Summary
PR-test-gke-a3-ultragpu-onspot (hpc-toolkit-dev)
PR-test-gke-a3-ultragpu-onspot (hpc-toolkit-dev)Successful in 304m — Summary
PR-test-gke-a4-onspot (hpc-toolkit-dev)
PR-test-gke-a4-onspot (hpc-toolkit-dev)Successful in 735m — Summary
PR-test-gke-a4x (hpc-toolkit-dev)
PR-test-gke-a4x (hpc-toolkit-dev)Successful in 716m — Summary
PR-test-gke-h4d-onspot (hpc-toolkit-dev)
PR-test-gke-h4d-onspot (hpc-toolkit-dev)Successful in 656m — Summary
PR-test-gke-inactive-reservation (hpc-toolkit-dev)
PR-test-gke-inactive-reservation (hpc-toolkit-dev)Successful in 231m — Summary
PR-test-gke-managed-hyperdisk (hpc-toolkit-dev)
PR-test-gke-managed-hyperdisk (hpc-toolkit-dev)Successful in 661m — Summary
PR-test-gke-managed-lustre (hpc-toolkit-dev)
PR-test-gke-managed-lustre (hpc-toolkit-dev)Successful in 543m — Summary
PR-test-gke-storage (hpc-toolkit-dev)
PR-test-gke-storage (hpc-toolkit-dev)Successful in 817m — Summary
PR-test-gke-tpu-7x (hpc-toolkit-dev)
PR-test-gke-tpu-7x (hpc-toolkit-dev)Successful in 483m — Summary
PR-test-gke-tpu-v6e (hpc-toolkit-dev)
PR-test-gke-tpu-v6e (hpc-toolkit-dev)Successful in 366m — Summary
PR-test-h4d-vm (hpc-toolkit-dev)
PR-test-h4d-vm (hpc-toolkit-dev)Successful in 777m — Summary
PR-test-hpc-build-slurm-image (hpc-toolkit-dev)
PR-test-hpc-build-slurm-image (hpc-toolkit-dev)Successful in 474m — Summary
PR-test-htc-slurm (hpc-toolkit-dev)
PR-test-htc-slurm (hpc-toolkit-dev)Successful in 208m — Summary
PR-test-htcondor (hpc-toolkit-dev)
PR-test-htcondor (hpc-toolkit-dev)Successful in 676m — Summary
PR-test-ml-a3-highgpu-onspot-slurm (hpc-toolkit-dev)
PR-test-ml-a3-highgpu-onspot-slurm (hpc-toolkit-dev)Successful in 99m — Summary
PR-test-ml-a3-megagpu-onspot-slurm-ubuntu (hpc-toolkit-dev)
PR-test-ml-a3-megagpu-onspot-slurm-ubuntu (hpc-toolkit-dev)Successful in 440m — Summary
PR-test-ml-a3-ultragpu-custom-blueprint-test (hpc-toolkit-dev)
PR-test-ml-a3-ultragpu-custom-blueprint-test (hpc-toolkit-dev)Successful in 182m — Summary
PR-test-ml-a3-ultragpu-onspot-jbvms (hpc-toolkit-dev)
PR-test-ml-a3-ultragpu-onspot-jbvms (hpc-toolkit-dev)Successful in 37m — Summary
PR-test-ml-a3-ultragpu-onspot-slurm (hpc-toolkit-dev)
PR-test-ml-a3-ultragpu-onspot-slurm (hpc-toolkit-dev)Successful in 843m — Summary
PR-test-ml-a4-highgpu-custom-blueprint-test (hpc-toolkit-dev)
PR-test-ml-a4-highgpu-custom-blueprint-test (hpc-toolkit-dev)Successful in 351m — Summary
PR-test-ml-a4-highgpu-onspot-slurm (hpc-toolkit-dev)
PR-test-ml-a4-highgpu-onspot-slurm (hpc-toolkit-dev)Successful in 643m — Summary
PR-test-ml-a4x-highgpu-slurm (hpc-toolkit-dev)
PR-test-ml-a4x-highgpu-slurm (hpc-toolkit-dev)Successful in 48m — Summary
PR-test-ml-g4-onspot-slurm (hpc-toolkit-dev)
PR-test-ml-g4-onspot-slurm (hpc-toolkit-dev)Successful in 595m — Summary
PR-test-ml-gke (hpc-toolkit-dev)
PR-test-ml-gke (hpc-toolkit-dev)Successful in 435m — Summary
PR-test-ml-gke-e2e (hpc-toolkit-dev)
PR-test-ml-gke-e2e (hpc-toolkit-dev)Successful in 135m — Summary
PR-test-ml-h4d-onspot-slurm (hpc-toolkit-dev)
PR-test-ml-h4d-onspot-slurm (hpc-toolkit-dev)Successful in 40m — Summary
PR-test-monitoring (hpc-toolkit-dev)
PR-test-monitoring (hpc-toolkit-dev)Successful in 767m — Summary
PR-test-netapp-volumes (hpc-toolkit-dev)
PR-test-netapp-volumes (hpc-toolkit-dev)Successful in 380m — Summary
PR-test-packer (hpc-toolkit-dev)
PR-test-packer (hpc-toolkit-dev)Successful in 247m — Summary
PR-test-pfs-managed-lustre-slurm (hpc-toolkit-dev)
PR-test-pfs-managed-lustre-slurm (hpc-toolkit-dev)Successful in 452m — Summary
PR-test-pfs-managed-lustre-vm (hpc-toolkit-dev)
PR-test-pfs-managed-lustre-vm (hpc-toolkit-dev)Successful in 393m — Summary
PR-test-slurm-flex (hpc-toolkit-dev)
PR-test-slurm-flex (hpc-toolkit-dev)Successful in 312m — Summary
PR-test-slurm-gcp-v6-debian (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-debian (hpc-toolkit-dev)Successful in 339m — Summary
PR-test-slurm-gcp-v6-reconfig-size (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-reconfig-size (hpc-toolkit-dev)Successful in 403m — Summary
PR-test-slurm-gcp-v6-rocky8 (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-rocky8 (hpc-toolkit-dev)Successful in 543m — Summary
PR-test-slurm-gcp-v6-simple-job-completion (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-simple-job-completion (hpc-toolkit-dev)Successful in 315m — Summary
PR-test-slurm-gcp-v6-ssd (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-ssd (hpc-toolkit-dev)Successful in 123m — Summary
PR-test-slurm-gcp-v6-startup-scripts (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-startup-scripts (hpc-toolkit-dev)Successful in 359m — Summary
PR-test-slurm-gcp-v6-static (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-static (hpc-toolkit-dev)Successful in 566m — Summary
PR-test-slurm-gcp-v6-topology (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-topology (hpc-toolkit-dev)Successful in 160m — Summary
PR-test-slurm-gcp-v6-ubuntu (hpc-toolkit-dev)
PR-test-slurm-gcp-v6-ubuntu (hpc-toolkit-dev)Successful in 416m — Summary
PR-test-slurm-gke (hpc-toolkit-dev)
PR-test-slurm-gke (hpc-toolkit-dev)Successful in 202m — Summary
PR-test-slurm-rapid-storage (hpc-toolkit-dev)
PR-test-slurm-rapid-storage (hpc-toolkit-dev)Successful in 301m — Summary
PR-test-spack-gromacs (hpc-toolkit-dev)
PR-test-spack-gromacs (hpc-toolkit-dev)Successful in 171m — Summary
PR-validation (hpc-toolkit-dev)
PR-validation (hpc-toolkit-dev)Successful in 8m — Summary
Required
Use pre-commit to validate Pull Request / pre-commit (pull_request)
Use pre-commit to validate Pull Request / pre-commit (pull_request)Successful in 9m
Required
Use pre-commit to validate Pull Request / pre-commit-highest-dependencies (pull_request)
Use pre-commit to validate Pull Request / pre-commit-highest-dependencies (pull_request)Successful in 10m
Required

@LAVEEN LAVEEN marked this pull request as ready for review April 25, 2026 11:50
@LAVEEN LAVEEN requested a review from a team as a code owner April 25, 2026 11:50
@LAVEEN LAVEEN enabled auto-merge (squash) April 25, 2026 11:51

@AdarshK15 AdarshK15 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@LAVEEN LAVEEN merged commit 7b75b0b into GoogleCloudPlatform:develop Apr 25, 2026
17 of 74 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-chore To not include into release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants