|
Harald Hoyer |
9d5d75 |
From 286685cb720f4150f363487c3702ea12d838f7df Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
9d5d75 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
9d5d75 |
Date: Thu, 16 Aug 2018 13:20:40 +0200
|
|
Harald Hoyer |
9d5d75 |
Subject: [PATCH] TEST-99-RPM: use releasever of the host system
|
|
Harald Hoyer |
9d5d75 |
|
|
Harald Hoyer |
9d5d75 |
---
|
|
Harald Hoyer |
9d5d75 |
test/TEST-99-RPM/test.sh | 4 ++--
|
|
Harald Hoyer |
9d5d75 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Harald Hoyer |
9d5d75 |
|
|
Harald Hoyer |
9d5d75 |
diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
|
|
Harald Hoyer |
9d5d75 |
index 984b9385..b4aca176 100755
|
|
Harald Hoyer |
9d5d75 |
--- a/test/TEST-99-RPM/test.sh
|
|
Harald Hoyer |
9d5d75 |
+++ b/test/TEST-99-RPM/test.sh
|
|
Harald Hoyer |
9d5d75 |
@@ -30,12 +30,12 @@ test_run() {
|
|
Harald Hoyer |
9d5d75 |
"$TESTDIR"/dracut-[0-9]*.$(arch).rpm \
|
|
Harald Hoyer |
9d5d75 |
"$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \
|
|
Harald Hoyer |
9d5d75 |
"$rootdir/$TESTDIR/"
|
|
Harald Hoyer |
9d5d75 |
-
|
|
Harald Hoyer |
9d5d75 |
+ . /etc/os-release
|
|
Harald Hoyer |
9d5d75 |
dnf_or_yum=yum
|
|
Harald Hoyer |
9d5d75 |
dnf_or_yum_cmd=yum
|
|
Harald Hoyer |
9d5d75 |
command -v dnf >/dev/null && { dnf_or_yum="dnf"; dnf_or_yum_cmd="dnf --allowerasing"; }
|
|
Harald Hoyer |
9d5d75 |
for (( i=0; i < 5 ; i++)); do
|
|
Harald Hoyer |
9d5d75 |
- $dnf_or_yum_cmd -v --nogpgcheck --installroot "$rootdir"/ --disablerepo='*' \
|
|
Harald Hoyer |
9d5d75 |
+ $dnf_or_yum_cmd -v --nogpgcheck --installroot "$rootdir"/ --releasever "$VERSION_ID" --disablerepo='*' \
|
|
Harald Hoyer |
9d5d75 |
--enablerepo=fedora --enablerepo=updates \
|
|
Harald Hoyer |
9d5d75 |
install -y \
|
|
Harald Hoyer |
9d5d75 |
$dnf_or_yum \
|
|
Harald Hoyer |
9d5d75 |
|