Browse Source

CI: Remove Flatcar specifics

We don't test Flatcar at all in CI, thus remove special handling for it.
pull/11793/head
Max Gautier 4 months ago
parent
commit
86a949dc81
Failed to extract signature
4 changed files with 7 additions and 40 deletions
  1. 12
      tests/testcases/015_check-nodes-ready.yml
  2. 12
      tests/testcases/020_check-pods-running.yml
  3. 12
      tests/testcases/030_check-network.yml
  4. 11
      tests/testcases/040_check-network-adv.yml

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

@ -1,18 +1,10 @@
--- ---
- name: Testcases checking nodes - name: Testcases checking nodes
hosts: kube_control_plane[0] hosts: kube_control_plane[0]
vars:
bin_dir: /usr/local/bin
tasks: 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] - import_role: # noqa name[missing]
name: cluster-dump name: cluster-dump

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

@ -1,18 +1,10 @@
--- ---
- name: Testcases checking pods - name: Testcases checking pods
hosts: kube_control_plane[0] hosts: kube_control_plane[0]
vars:
bin_dir: /usr/local/bin
tasks: 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] - import_role: # noqa name[missing]
name: cluster-dump name: cluster-dump

12
tests/testcases/030_check-network.yml

@ -4,17 +4,9 @@
vars: vars:
test_image_repo: registry.k8s.io/e2e-test-images/agnhost test_image_repo: registry.k8s.io/e2e-test-images/agnhost
test_image_tag: "2.40" test_image_tag: "2.40"
bin_dir: "/usr/local/bin"
tasks: 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 - name: Check kubelet serving certificates approved with kubelet_csr_approver
when: when:
@ -102,7 +94,7 @@
- name: Check that all pods are running and ready - name: Check that all pods are running and ready
vars: vars:
pods: "{{ (pods_json | from_json)['items'] }}"
pods: "{{ (pods_json.stdout | from_json)['items'] }}"
block: block:
- name: Check Deployment is ready - name: Check Deployment is ready
command: "{{ bin_dir }}/kubectl rollout status deploy --namespace test agnhost --timeout=180s" command: "{{ bin_dir }}/kubectl rollout status deploy --namespace test agnhost --timeout=180s"

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

@ -19,18 +19,9 @@
agent_report_interval: 10 agent_report_interval: 10
netcheck_namespace: default netcheck_namespace: default
netchecker_port: 31081 netchecker_port: 31081
bin_dir: "/usr/local/bin"
tasks: 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] - import_role: # noqa name[missing]
name: cluster-dump name: cluster-dump

Loading…
Cancel
Save