From 1a69a8919b5a08445d3d8847f3b5cee8575a63fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
Date: Fri, 2 Oct 2020 13:18:34 +0200
Subject: [PATCH] schutzbot: use s3cmd from repositories

s3cmd from pip doesn't work with Python 3.9. Fortunately, s3cmd in Fedora has
a downstream patch to fix it.

See rhbz#1884607 and https://github.com/s3tools/s3cmd/pull/1137
---
 schutzbot/mockbuild.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index 62683ccf9..a87c65c2d 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -10,7 +10,7 @@ function greenprint {
 source /etc/os-release
 ARCH=$(uname -m)
 
-# Mock is only available in EPEL for RHEL.
+# Mock and s3cmd is only available in EPEL for RHEL.
 if [[ $ID == rhel ]] && ! rpm -q epel-release; then
     greenprint "📦 Setting up EPEL repository"
     curl -Ls --retry 5 --output /tmp/epel.rpm \
@@ -27,13 +27,7 @@ fi
 
 # Install requirements for building RPMs in mock.
 greenprint "📦 Installing mock requirements"
-sudo dnf -y install createrepo_c make mock python3-pip rpm-build
-
-# Install s3cmd if it is not present.
-if ! s3cmd --version > /dev/null 2>&1; then
-    greenprint "📦 Installing s3cmd"
-    sudo pip3 -q install s3cmd
-fi
+sudo dnf -y install createrepo_c make mock rpm-build s3cmd
 
 # Jenkins sets a workspace variable as the root of its working directory.
 WORKSPACE=${WORKSPACE:-$(pwd)}