From 969e4296f09221b562071d163a75199dd2b6a772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Tue, 7 Dec 2021 14:17:18 +0100
Subject: [PATCH] test/koji: patch koji 1.27 that accidentally removed --keytab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://pagure.io/koji/pull-request/3172

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 test/cases/koji.sh                            |  8 +++++
 ...urn-mistakenly-dropped-option-keytab.patch | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 test/data/koji/Return-mistakenly-dropped-option-keytab.patch

diff --git a/test/cases/koji.sh b/test/cases/koji.sh
index b3cf4292d..7f69b2b71 100755
--- a/test/cases/koji.sh
+++ b/test/cases/koji.sh
@@ -14,6 +14,14 @@ function greenprint {
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
 
+# See https://pagure.io/koji/pull-request/3172
+greenprint "Fix missing --keytab in koji-cli 1.27"
+if [[ $(rpm -q koji) == koji-1.27* ]];
+then
+    sudo dnf install -y patch
+    cat /usr/share/tests/osbuild-composer/koji/Return-mistakenly-dropped-option-keytab.patch | sudo patch -p1 -d /usr/bin
+fi
+
 # Make sure podman-plugins are installed
 sudo dnf -y install podman-plugins
 
diff --git a/test/data/koji/Return-mistakenly-dropped-option-keytab.patch b/test/data/koji/Return-mistakenly-dropped-option-keytab.patch
new file mode 100644
index 000000000..c768a8f74
--- /dev/null
+++ b/test/data/koji/Return-mistakenly-dropped-option-keytab.patch
@@ -0,0 +1,29 @@
+From fc1708d81abaa933c163587ecb48dd246d86a35b Mon Sep 17 00:00:00 2001
+From: Tomas Kopecek <tkopecek@redhat.com>
+Date: Tue, 7 Dec 2021 11:28:03 +0100
+Subject: [PATCH] Return mistakenly dropped option (--keytab)
+
+PR https://pagure.io/koji/pull-request/3051 was wrongly merged
+https://pagure.io/koji/c/071533206e6d29f665d7a5864eda75087488a3ce?branch=master
+and deleted wrong line. Reverting it.
+
+Fixes: https://pagure.io/koji/issue/3171
+---
+ cli/koji | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cli/koji b/cli/koji
+index a0a9bd7f..87fd6f15 100755
+--- a/koji
++++ b/koji
+@@ -120,6 +120,7 @@ def get_options():
+     parser.add_option("-c", "--config", dest="configFile",
+                       help="load profile's settings from another file. Use with --profile.",
+                       metavar="FILE")
++    parser.add_option("--keytab", help="specify a Kerberos keytab to use", metavar="FILE")
+     parser.add_option("--principal", help="specify a Kerberos principal to use")
+     parser.add_option("--cert", help="specify a SSL cert to use", metavar="FILE")
+     parser.add_option("--runas", help="run as the specified user (requires special privileges)")
+-- 
+2.33.1
+