Skip to content

Commit

Permalink
CI: Remove Flatcar specifics
Browse files Browse the repository at this point in the history
We don't test Flatcar at all in CI, thus remove special handling for it.
  • Loading branch information
VannTen committed Dec 13, 2024
1 parent d0d3041 commit b44a731
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 40 deletions.
12 changes: 2 additions & 10 deletions tests/testcases/015_check-nodes-ready.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
---
- name: Testcases checking nodes
hosts: kube_control_plane[0]
vars:
bin_dir: /usr/local/bin
tasks:

- name: Force binaries directory for Flatcar Container Linux by Kinvolk
set_fact:
bin_dir: "/opt/bin"
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- name: Force binaries directory for other hosts
set_fact:
bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- import_role: # noqa name[missing]
name: cluster-dump

Expand Down
12 changes: 2 additions & 10 deletions tests/testcases/020_check-pods-running.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
---
- name: Testcases checking pods
hosts: kube_control_plane[0]
vars:
bin_dir: /usr/local/bin
tasks:

- name: Force binaries directory for Flatcar Container Linux by Kinvolk
set_fact:
bin_dir: "/opt/bin"
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- name: Force binaries directory for other hosts
set_fact:
bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- import_role: # noqa name[missing]
name: cluster-dump

Expand Down
12 changes: 2 additions & 10 deletions tests/testcases/030_check-network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,9 @@
vars:
test_image_repo: registry.k8s.io/e2e-test-images/agnhost
test_image_tag: "2.40"
bin_dir: "/usr/local/bin"

tasks:
- name: Force binaries directory for Flatcar Container Linux by Kinvolk
set_fact:
bin_dir: "/opt/bin"
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- name: Force binaries directory for other hosts
set_fact:
bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- name: Check kubelet serving certificates approved with kubelet_csr_approver
when:
Expand Down Expand Up @@ -102,7 +94,7 @@

- name: Check that all pods are running and ready
vars:
pods: "{{ (pods_json | from_json)['items'] }}"
pods: "{{ (pods_json.stdout | from_json)['items'] }}"
block:
- name: Check Deployment is ready
command: "{{ bin_dir }}/kubectl rollout status deploy --namespace test agnhost --timeout=180s"
Expand Down
11 changes: 1 addition & 10 deletions tests/testcases/040_check-network-adv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,9 @@
agent_report_interval: 10
netcheck_namespace: default
netchecker_port: 31081
bin_dir: "/usr/local/bin"

tasks:
- name: Force binaries directory for Container Linux by CoreOS and Flatcar
set_fact:
bin_dir: "/opt/bin"
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- name: Force binaries directory on other hosts
set_fact:
bin_dir: "/usr/local/bin"
when: not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- import_role: # noqa name[missing]
name: cluster-dump

Expand Down

0 comments on commit b44a731

Please sign in to comment.