From f907cef9e48ac5b8cab95fdddb8946f378dbaf40 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 2 Jun 2021 12:37:08 +0100
Subject: [PATCH] Manually merge fedora/rawhide related: rhbz#1950632

Add gating tests for RHEL 9
resolves: rhbz#1950604
---
 gating.yaml         |  6 ++++++
 nbdkit.spec         | 19 +++++++++++++++++--
 sources             |  4 ++--
 tests/basic-test.sh |  6 ++++++
 tests/tests.yml     | 12 ++++++++++++
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100755 gating.yaml
 create mode 100755 tests/basic-test.sh
 create mode 100755 tests/tests.yml

diff --git a/gating.yaml b/gating.yaml
new file mode 100755
index 0000000..648918d
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/nbdkit.spec b/nbdkit.spec
index 00c9f9f..a8592dd 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -50,8 +50,8 @@ ExclusiveArch:  x86_64
 %global source_directory 1.25-development
 
 Name:           nbdkit
-Version:        1.25.7
-Release:        1%{?dist}
+Version:        1.25.8
+Release:        2%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -1223,6 +1223,21 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Tue May 25 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.25.8-2
+- Perl 5.34 re-rebuild of updated packages
+
+* Tue May 25 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.8-1
+- New upstream version 1.25.8.
+
+* Tue May 25 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.25.7-4
+- Perl 5.34 re-rebuild updated packages
+
+* Tue May 25 2021 Leigh Scott <leigh123linux@gmail.com> - 1.25.7-3
+- Rebuild for new libtorrent
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.25.7-2
+- Perl 5.34 rebuild
+
 * Wed May 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.25.7-1
 - New upstream version 1.25.7.
 - Disable libguestfs tests on riscv64.
diff --git a/sources b/sources
index db5b068..bf1f333 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.25.7.tar.gz) = a4ff0045971bddb89ace27968f4248c1302fbc9aa7e19a417f3bb79e78c531cf9a561c5dccb66580378a0f6b2bbe7b344ba7a6eb88e3bc3bf2dedb275bfeafff
-SHA512 (nbdkit-1.25.7.tar.gz.sig) = f28c2aeaaa142767408d537d3e01437c24385c22e6a20cccb76edd6c9edc3fb82dc835cf65dcc4718bed90e31c458bbfe3b205bb3557013ed2ae2164321b080d
+SHA512 (nbdkit-1.25.8.tar.gz) = 4084fbc3fb24eb20114e8c31eb4ea1f763a2c4c09048a29447f9df7a0101049e97d82ed00b581ff22fc4ec5e0221beeb67107f57be101544b49bc6192e8ada13
+SHA512 (nbdkit-1.25.8.tar.gz.sig) = 71f9ddc29974474b074e06ba19ccaffbca59ed425e73a3962ed698dfbcc94aeddbcd0b138fe3e1c99074cfcb79c404c790a5418b5083ccf3daac65643791a189
diff --git a/tests/basic-test.sh b/tests/basic-test.sh
new file mode 100755
index 0000000..07eb459
--- /dev/null
+++ b/tests/basic-test.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -
+set -e
+set -x
+
+# Run nbdkit and check that nbdinfo can connect back to it.
+nbdkit -U - memory 1G --run 'nbdinfo "$uri"'
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100755
index 0000000..28c6a43
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - libnbd
+    - nbdkit
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh