Skip to content

Commit 761d5b0

Browse files
authored
Merge pull request #1249 from henrywang/tmt_runner
test: drop nested virt required on integration test
2 parents 0371407 + ffa709f commit 761d5b0

38 files changed

+252
-152
lines changed

.packit.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,16 @@ jobs:
6969
- job: tests
7070
trigger: pull_request
7171
targets:
72+
- centos-stream-9-x86_64
73+
- centos-stream-9-aarch64
74+
- centos-stream-10-x86_64
75+
- centos-stream-10-aarch64
7276
- fedora-41-x86_64
7377
- fedora-41-aarch64
78+
- fedora-42-x86_64
79+
- fedora-42-aarch64
80+
- fedora-rawhide-x86_64
81+
- fedora-rawhide-aarch64
7482
tmt_plan: /integration
7583
skip_build: true
7684
identifier: integration-test

hack/provision-derived.sh

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,34 @@ set -xeu
33
# I'm a big fan of nushell for interactive use, and I want to support
44
# using it in our test suite because it's better than bash. First,
55
# enable EPEL to get it.
6-
. /usr/lib/os-release
7-
if echo $ID_LIKE $ID | grep -q centos; then
8-
dnf config-manager --set-enabled crb
9-
dnf -y install epel-release epel-next-release
10-
fi
6+
117
# Ensure this is pre-created
128
mkdir -p -m 0700 /var/roothome
139
mkdir -p ~/.config/nushell
1410
echo '$env.config = { show_banner: false, }' > ~/.config/nushell/config.nu
1511
touch ~/.config/nushell/env.nu
16-
dnf -y install nu
17-
dnf clean all
12+
13+
. /usr/lib/os-release
14+
case "${ID}-${VERSION_ID}" in
15+
"centos-9")
16+
dnf config-manager --set-enabled crb
17+
dnf -y install epel-release epel-next-release
18+
dnf -y install nu
19+
dnf clean all
20+
;;
21+
"centos-10")
22+
# nu is not available in CS10
23+
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
24+
mkdir -p nu && tar zvxf nu.tar.gz --strip-components=1 -C nu
25+
mv nu/nu /usr/bin/nu
26+
rm -rf nu nu.tar.gz
27+
;;
28+
"fedora-"*)
29+
dnf -y install nu
30+
dnf clean all
31+
;;
32+
esac
33+
1834
# Stock extra cleaning of logs and caches in general (mostly dnf)
1935
rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf
2036
# And clean root's homedir

plans/integration.fmf

Lines changed: 0 additions & 33 deletions
This file was deleted.

plans/test-01-readonly.fmf

Lines changed: 0 additions & 19 deletions
This file was deleted.

plans/test-20-local-upgrade.fmf

Lines changed: 0 additions & 13 deletions
This file was deleted.

plans/test-21-logically-bound-switch.fmf

Lines changed: 0 additions & 13 deletions
This file was deleted.

plans/test-22-logically-bound-install.fmf

Lines changed: 0 additions & 11 deletions
This file was deleted.

plans/test-23-install-outside-container.fmf

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/containerfiles/lbi/Containerfile

Lines changed: 0 additions & 42 deletions
This file was deleted.

tests/integration.fmf

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)