diff --git a/tests/common_vars.yml b/tests/common_vars.yml index bc89406c4..1450a3b6c 100644 --- a/tests/common_vars.yml +++ b/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" diff --git a/tests/testcases/015_check-nodes-ready.yml b/tests/testcases/015_check-nodes-ready.yml index 536207211..1b196a58f 100644 --- a/tests/testcases/015_check-nodes-ready.yml +++ b/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] diff --git a/tests/testcases/020_check-pods-running.yml b/tests/testcases/020_check-pods-running.yml index a573bb1cc..d3f1a4b9f 100644 --- a/tests/testcases/020_check-pods-running.yml +++ b/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] diff --git a/tests/testcases/030_check-network.yml b/tests/testcases/030_check-network.yml index e3e5a9b80..4d0ab78b7 100644 --- a/tests/testcases/030_check-network.yml +++ b/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: diff --git a/tests/testcases/040_check-network-adv.yml b/tests/testcases/040_check-network-adv.yml index e036fcba6..9f40e10f5 100644 --- a/tests/testcases/040_check-network-adv.yml +++ b/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]