Skip to content

Commit 8cc76a7

Browse files
committed
fix(validation): Resolve PSA collisions in base integration tests
Apply the PSA cleanup and variable scope fixes to the base integration test playbook (`base-integration-test.yml`). This ensures GKE and other non-Slurm tests can also resolve static VPC names, clean up stale PSA connections pre-deployment, and correctly target them during failure recovery/rescue. Change-Id: I3250fdefcd041f3523aca70d964f44df605358a4
1 parent c891ffe commit 8cc76a7

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,18 @@
5757
ansible.builtin.include_tasks:
5858
file: tasks/create_deployment_directory.yml
5959

60+
- name: Set actual_network variable
61+
ansible.builtin.set_fact:
62+
actual_network: "{% if use_fixed_vpc | default(false) %}{{ test_prefix | default('') }}{{ test_name }}-0{% else %}{{ network }}{% endif %}"
63+
6064
- name: Create Infrastructure and test
6165
block:
66+
- name: Clean up any existing PSA resources from previous runs
67+
ansible.builtin.include_tasks:
68+
file: tasks/cleanup_existing_psa.yml
69+
vars:
70+
psa_network: "{{ actual_network }}"
71+
6272
- name: Create Cluster with gcluster
6373
register: deployment
6474
changed_when: deployment.changed
@@ -143,6 +153,7 @@
143153
ansible.builtin.add_host:
144154
hostname: "{{ remote_ip }}"
145155
groups: [remote_host]
156+
actual_network: "{{ actual_network }}"
146157
when: (remote_ip | default('')) | ansible.utils.ipaddr != false
147158

148159
- name: Wait for host tasks

0 commit comments

Comments
 (0)