From 132c66f45d693d8f2566ebb8a73202572dd46dbd Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Fri, 4 Oct 2024 15:16:56 +0300 Subject: [PATCH 1/2] playbook: install python-{selinux,packaging} rpms. We need python-{selinux,packaging} with distro=fedora/40-cloud-image. Signed-off-by: Krisztian Litkey --- test/e2e/playbook/provision.yaml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/test/e2e/playbook/provision.yaml b/test/e2e/playbook/provision.yaml index c6a6f7482..bdbfbe7f5 100644 --- a/test/e2e/playbook/provision.yaml +++ b/test/e2e/playbook/provision.yaml @@ -139,13 +139,23 @@ when: ansible_facts['distribution'] == "Ubuntu" - name: Install rpm packages - ansible.builtin.dnf: - pkg: - - iproute-tc - - grubby - state: present - update_cache: true when: ansible_facts['distribution'] == "Fedora" + block: + - name: Common rpm packages + ansible.builtin.dnf: + pkg: + - iproute-tc + - grubby + state: present + update_cache: true + - name: Extra python3 rpm packages for ansible + ansible.builtin.dnf: + pkg: + - python3-libselinux + - python3-packaging + state: + present + when: ansible_facts['distribution_major_version'] | int >= 40 - name: Disable SELinux ansible.posix.selinux: From ab25ea15255d0a09163d6379b89eeffb1c3aa7f5 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Fri, 4 Oct 2024 15:42:11 +0300 Subject: [PATCH 2/2] test/e2e: switch default distro to fedora/40-cloud-base. Signed-off-by: Krisztian Litkey --- test/e2e/run.sh | 2 +- test/e2e/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/run.sh b/test/e2e/run.sh index 820d6f3b1..70a694bf3 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -1,7 +1,7 @@ #!/bin/bash TITLE="NRI Resource Policy End-to-End Testing" -DEFAULT_DISTRO=${DEFAULT_DISTRO:-"generic/fedora37"} +DEFAULT_DISTRO=${DEFAULT_DISTRO:-"fedora/40-cloud-base"} # Other tested distros # generic/ubuntu2204 diff --git a/test/e2e/run_tests.sh b/test/e2e/run_tests.sh index 35bbd3772..1bbcb2c54 100755 --- a/test/e2e/run_tests.sh +++ b/test/e2e/run_tests.sh @@ -3,7 +3,7 @@ TESTS_DIR="$1" RUN_SH="${0%/*}/run.sh" -DEFAULT_DISTRO=${DEFAULT_DISTRO:-"generic/fedora37"} +DEFAULT_DISTRO=${DEFAULT_DISTRO:-"fedora/40-cloud-base"} k8scri=${k8scri:="containerd"}