Browse Source

Test: remove `bin_dir` from other tasks move to common_vars.yml

Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
pull/11868/head
ChengHao Yang 4 months ago
parent
commit
0d5e18053e
Failed to extract signature
5 changed files with 2 additions and 6 deletions
  1. 2
      tests/common_vars.yml
  2. 2
      tests/testcases/015_check-nodes-ready.yml
  3. 2
      tests/testcases/020_check-pods-running.yml
  4. 1
      tests/testcases/030_check-network.yml
  5. 1
      tests/testcases/040_check-network-adv.yml

2
tests/common_vars.yml

@ -4,6 +4,8 @@ deploy_netchecker: true
dns_min_replicas: 1
unsafe_show_logs: true
bin_dir: "{{ '/opt/bin' if ansible_os_family == 'Flatcar' else '/usr/local/bin' }}"
# Registry mirrors settings
docker_registry_mirrors:
- "https://mirror.gcr.io"

2
tests/testcases/015_check-nodes-ready.yml

@ -1,8 +1,6 @@
---
- name: Testcases checking nodes
hosts: kube_control_plane[0]
vars:
bin_dir: /usr/local/bin
tasks:
- import_role: # noqa name[missing]

2
tests/testcases/020_check-pods-running.yml

@ -1,8 +1,6 @@
---
- name: Testcases checking pods
hosts: kube_control_plane[0]
vars:
bin_dir: /usr/local/bin
tasks:
- import_role: # noqa name[missing]

1
tests/testcases/030_check-network.yml

@ -6,7 +6,6 @@
test_image_tag: "2.40"
# TODO: source those from kubespray_defaults instead.
# Needs kubespray_defaults to be decoupled from no-proxy stuff
bin_dir: "/usr/local/bin"
kube_pods_subnet: "{{ 'fd85:ee78:d8a6:8607::1:0000/112' if not (ipv4_stack | default(true)) else '10.233.64.0/18' }}"
tasks:

1
tests/testcases/040_check-network-adv.yml

@ -19,7 +19,6 @@
agent_report_interval: 10
netcheck_namespace: default
netchecker_port: 31081
bin_dir: "/usr/local/bin"
tasks:
- import_role: # noqa name[missing]

Loading…
Cancel
Save