mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-03-28 22:35:12 -02:30
CI: Remove Flatcar specifics
We don't test Flatcar at all in CI, thus remove special handling for it.
This commit is contained in:
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user