Refactor vm_count in tests provisioning

kubernetes-sigs · Dec 15, 2023 · e3a971b · e3a971b
1 parent 3370a4a
commit e3a971b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/tests/cloud_playbooks/roles/packet-ci/tasks/main.yml b/tests/cloud_playbooks/roles/packet-ci/tasks/main.yml
@@ -3,10 +3,6 @@
 - name: "Include custom vars for ci job: {{ ci_job_name }}"
   include_vars: "../files/{{ ci_job_name }}.yml"
 
-- name: Set VM count needed for CI test_id
-  set_fact:
-    vm_count: "{%- if mode in ['separate', 'separate-scale', 'ha', 'ha-scale', 'ha-recover', 'ha-recover-noquorum'] -%}{{ 3 | int }}{%- elif mode == 'all-in-one' -%}{{ 1 | int }}{%- else -%}{{ 2 | int }}{%- endif -%}"
-
 - name: Cleamup old VMs
   import_tasks: cleanup-old-vms.yml
 

diff --git a/tests/cloud_playbooks/roles/packet-ci/vars/main.yml b/tests/cloud_playbooks/roles/packet-ci/vars/main.yml
@@ -0,0 +1,12 @@
+---
+_vm_count_dict:
+  separate: 3
+  separate-scale: 3
+  ha: 3
+  ha-scale: 3
+  ha-recover: 3
+  ha-recover-noquorum: 3
+  all-in-one: 1
+  default: 2
+
+vm_count: "{{ _vm_count_dict[mode | d('default')] }}"