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.

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

test: drop nested virt required on integration test #1249

Merged
merged 1 commit into from
Apr 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,16 @@ jobs:
- job: tests
trigger: pull_request
targets:
- centos-stream-9-x86_64
- centos-stream-9-aarch64
- centos-stream-10-x86_64
- centos-stream-10-aarch64
- fedora-41-x86_64
- fedora-41-aarch64
- fedora-42-x86_64
- fedora-42-aarch64
- fedora-rawhide-x86_64
- fedora-rawhide-aarch64
tmt_plan: /integration
skip_build: true
identifier: integration-test
Expand Down
30 changes: 23 additions & 7 deletions hack/provision-derived.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,34 @@ set -xeu
# I'm a big fan of nushell for interactive use, and I want to support
# using it in our test suite because it's better than bash. First,
# enable EPEL to get it.
. /usr/lib/os-release
if echo $ID_LIKE $ID | grep -q centos; then
dnf config-manager --set-enabled crb
dnf -y install epel-release epel-next-release
fi

# Ensure this is pre-created
mkdir -p -m 0700 /var/roothome
mkdir -p ~/.config/nushell
echo '$env.config = { show_banner: false, }' > ~/.config/nushell/config.nu
touch ~/.config/nushell/env.nu
dnf -y install nu
dnf clean all

. /usr/lib/os-release
case "${ID}-${VERSION_ID}" in
"centos-9")
dnf config-manager --set-enabled crb
dnf -y install epel-release epel-next-release
dnf -y install nu
dnf clean all
;;
"centos-10")
# nu is not available in CS10
curl -kL "https://github.com/nushell/nushell/releases/download/0.103.0/nu-0.103.0-$(uname -m)-unknown-linux-gnu.tar.gz" --output nu.tar.gz
mkdir -p nu && tar zvxf nu.tar.gz --strip-components=1 -C nu
mv nu/nu /usr/bin/nu
rm -rf nu nu.tar.gz
;;
"fedora-"*)
dnf -y install nu
dnf clean all
;;
esac

# Stock extra cleaning of logs and caches in general (mostly dnf)
rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf
# And clean root's homedir
Expand Down
33 changes: 0 additions & 33 deletions plans/integration.fmf

This file was deleted.

19 changes: 0 additions & 19 deletions plans/test-01-readonly.fmf

This file was deleted.

13 changes: 0 additions & 13 deletions plans/test-20-local-upgrade.fmf

This file was deleted.

13 changes: 0 additions & 13 deletions plans/test-21-logically-bound-switch.fmf

This file was deleted.

11 changes: 0 additions & 11 deletions plans/test-22-logically-bound-install.fmf

This file was deleted.

11 changes: 0 additions & 11 deletions plans/test-23-install-outside-container.fmf

This file was deleted.

42 changes: 0 additions & 42 deletions tests/containerfiles/lbi/Containerfile

This file was deleted.

3 changes: 0 additions & 3 deletions tests/integration.fmf

This file was deleted.

56 changes: 56 additions & 0 deletions tmt/plans/integration.fmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Please change the image when you run this plan locally with tmt run
# tmt run -vvvvv plan -n /integration/test-01-readonly
# local image: file:///home/foobar/image.qcow2
provision:
how: virtual
image: https://composes.stream.centos.org/stream-10/production/CentOS-Stream-10-20250331.0/compose/BaseOS/x86_64/images/CentOS-Stream-GenericCloud-10-20250331.0.x86_64.qcow2
prepare:
- how: install
package:
- podman
- skopeo
- jq
execute:
how: tmt

/test-01-readonly:
summary: Execute booted readonly/nondestructive tests
discover:
how: fmf
test:
- /tmt/tests/test-00-bootc-install
- /tmt/tests/test-01-readonly

/test-20-local-upgrade:
summary: Execute local upgrade tests
discover:
how: fmf
test:
- /tmt/tests/test-00-bootc-install
- /tmt/tests/test-20-local-upgrade

/test-21-logically-bound-switch:
summary: Execute logically bound images tests for switching images
discover:
how: fmf
test:
- /tmt/tests/test-00-bootc-install
- /tmt/tests/test-21-logically-bound-switch

/test-22-logically-bound-install:
summary: Execute logically bound images tests for switching images
environment+:
LBI: enabled
discover:
how: fmf
test:
- /tmt/tests/test-00-bootc-install
- /tmt/tests/test-22-logically-bound-install

/test-23-install-outside-container:
summary: Execute tests for installing outside of a container
discover:
how: fmf
test:
- /tmt/tests/test-00-bootc-install
- /tmt/tests/test-23-install-outside-container
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions tmt/tests/test-00-bootc-install.fmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
summary: Run bootc install to-existing-root to deploy bootc image
test: ./test-00-bootc-install.sh
duration: 30m
Loading