Skip to content

fix(validation): Resolve PSA collisions in base integration tests #5983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shubpal07 wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −2
Open

fix(validation): Resolve PSA collisions in base integration tests #5983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion tools/cloud-build/daily-tests/ansible_playbooks/base-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,18 @@
ansible.builtin.include_tasks:
file: tasks/create_deployment_directory.yml

- name: Set actual_network variable
ansible.builtin.set_fact:
actual_network: "{% if use_fixed_vpc | default(false) | bool %}{{ test_prefix | default('') }}{{ test_name }}-0{% else %}{{ network }}{% endif %}"

- name: Create Infrastructure and test
block:
- name: Clean up any existing PSA resources from previous runs
ansible.builtin.include_tasks:
file: tasks/cleanup_existing_psa.yml
vars:
psa_network: "{{ actual_network }}"

- name: Create Cluster with gcluster
register: deployment
changed_when: deployment.changed
Expand Down Expand Up @@ -120,7 +130,7 @@
- "{{ deployment_name }}"
- --direction=INGRESS
- --priority=1000
- --network={% if use_fixed_vpc | default(false) %}{{ test_prefix | default('') }}{{ test_name }}-0{% else %}{{ network }}{% endif %}
- --network={{ actual_network }}
- --action=ALLOW
- --rules=tcp:22
- --source-ranges={{ build_ip.stdout }}
Expand All @@ -143,6 +153,7 @@
ansible.builtin.add_host:
hostname: "{{ remote_ip }}"
groups: [remote_host]
actual_network: "{{ actual_network }}"
when: (remote_ip | default('')) | ansible.utils.ipaddr != false

- name: Wait for host tasks
Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/daily-tests/ansible_playbooks/slurm-integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
- name: Set actual network name
ansible.builtin.set_fact:
actual_network: "{% if use_fixed_vpc | default(false) %}{{ test_prefix | default('') }}{{ test_name }}-0{% else %}{{ network }}{% endif %}"
actual_network: "{% if use_fixed_vpc | default(false) | bool %}{{ test_prefix | default('') }}{{ test_name }}-0{% else %}{{ network }}{% endif %}"

- name: Run Pre Deploy Tasks
ansible.builtin.include_tasks: "{{ pre_deploy_task }}"
Expand Down
Loading