Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e2e: switch default test distro to fedora/40-cloud-base. #375

Merged
merged 2 commits into from
Oct 5, 2024
Merged

e2e: switch default test distro to fedora/40-cloud-base. #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
132c66f
playbook: install python-{selinux,packaging} rpms.
klihub Oct 4, 2024
ab25ea1
test/e2e: switch default distro to fedora/40-cloud-base.
klihub Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions test/e2e/playbook/provision.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +146 to +155
Copy link
Collaborator

@fmuyassarov fmuyassarov Oct 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would merge these two tasks into one and create a single list of requires packages.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 2nd one is conditional not necessary (and neither possible) on our older Fedora distros.

state:
present
when: ansible_facts['distribution_major_version'] | int >= 40

- name: Disable SELinux
ansible.posix.selinux:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}

Expand Down