From cbd1e669c9a77f1298b73f9030fc7f225558897f Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 27 2023 23:48:14 +0000
Subject: Update to recent upstream git, resync spec, drop merged patch


---

diff --git a/.gitignore b/.gitignore
index 9c546a1..d5675f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,5 @@
 /assetcache-0864455630bf2987681b56e57803a99bae73d742.tar.xz
 /openQA-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.gz
 /assetcache-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.xz
+/openQA-872b39721c693fc06ede88b366975bf4e2352c7d.tar.gz
+/assetcache-872b39721c693fc06ede88b366975bf4e2352c7d.tar.xz
diff --git a/openqa.spec b/openqa.spec
index 8d09a85..8a5f5b3 100644
--- a/openqa.spec
+++ b/openqa.spec
@@ -23,9 +23,9 @@
 %global github_owner    os-autoinst
 %global github_name     openQA
 %global github_version  4.6
-%global github_commit   c944acc8be48645a4e5d8e98882e4e54fcf85287
+%global github_commit   872b39721c693fc06ede88b366975bf4e2352c7d
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20231024
+%global github_date     20231125
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 # can't use linebreaks here!
@@ -71,9 +71,9 @@
 # critic and (python) yamllint requirements dropped as we don't run those
 # checks in our package build (except Perl::Critic itself as the
 # compile-check-all test fails on the in-tree critic module if we leave
-# that out)
+# that out), ssh-keygen is in openssh in Fedora (openssh-common in SUSE)
 # The following line is generated from dependencies.yaml (upstream)
-%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires ShellCheck curl jq os-autoinst-devel perl(App::cpanminus) perl(Perl::Critic) perl(Test::Exception) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 postgresql-server
+%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires ShellCheck curl jq openssh os-autoinst-devel perl(App::cpanminus) perl(Perl::Critic) perl(Test::Exception) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 postgresql-server
 %ifarch x86_64
 %define qemu qemu qemu-kvm
 %else
@@ -126,10 +126,6 @@ Source4:        23-fedora-messaging.t
 Source5:        geekotest.conf
 Source6:        openQA-worker.conf
 
-# https://github.com/os-autoinst/openQA/pull/5349
-# fix skipping tests when selenium driver is missing
-Patch:          0001-Fix-skipping-Selenium-tests.patch
-
 BuildRequires: make
 BuildRequires:  %{python_scripts_requires}
 BuildRequires:  perl-generators
@@ -746,6 +742,9 @@ fi
 %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
 
 %changelog
+* Mon Nov 27 2023 Adam Williamson <awilliam@redhat.com> - 4.6^20231125git872b397-1
+- Update to recent upstream git, resync spec, drop merged patch
+
 * Tue Oct 31 2023 Adam Williamson <awilliam@redhat.com> - 4.6^20231024gitc944acc-1
 - Update to a recent upstream git snapshot, resync spec
 - Backport PR #5349 to fix a test skipping problem
diff --git a/sources b/sources
index b3a09ab..de4f0aa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openQA-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.gz) = c07a6aeaed761e4588aa55b06abc2b3827e3aeb0cbf77118ab32daaed42ada35b5a610c094e16a5de4638366ff13902c16b310b79fa87549f0a37c7f4e3e4f93
-SHA512 (assetcache-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.xz) = 2d4b9391be3951953cdbce25ad1d34e6f184757af31a08e7b96ec90b93d7dfc6e3a985c6c20e8cf68c14b3fb9969017a659eeed79ec64ac2062fb6afee195173
+SHA512 (openQA-872b39721c693fc06ede88b366975bf4e2352c7d.tar.gz) = 793ea03384551150a3e77180115065fcb37d1abaed851e93dc8192eb60db8fe200116f39173fb3e8f64a3f4d5efc6251b3c72fcd954f7f8f52404bb2bc7415f7
+SHA512 (assetcache-872b39721c693fc06ede88b366975bf4e2352c7d.tar.xz) = f5fb7462d1d46cbd593b4c7449a285f6ae985c3156df06775b4105b47b21a4d9551b529ce0a0ecf41fd290c6fa2cfca5ad04aa09d7839420faf7bfee3ffcea7f