From c25e58bc9d630eb5f23d6eb4c5f776f4e255fa6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Fri, 9 Jul 2021 11:36:59 +0200
Subject: [PATCH] ci: assume subscribed machines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 schutzbot/deploy.sh    | 10 ----------
 schutzbot/mockbuild.sh |  1 -
 2 files changed, 11 deletions(-)

diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh
index b9132d777..c3ba59689 100755
--- a/schutzbot/deploy.sh
+++ b/schutzbot/deploy.sh
@@ -63,16 +63,6 @@ if [[ $ID == "rhel" && ${VERSION_ID%.*} == "9" ]]; then
   sudo systemctl stop tmp.mount && sudo systemctl mask tmp.mount
 fi
 
-if [[ $ID == "rhel" && $VERSION_ID == "8.3" && -n "${RHN_REGISTRATION_SCRIPT:-}" ]] && ! sudo subscription-manager status; then
-    greenprint "Registering RHEL"
-    sudo chmod +x "$RHN_REGISTRATION_SCRIPT"
-    for _ in {0..4}
-    do
-        sudo "$RHN_REGISTRATION_SCRIPT" && break
-    sleep 5
-    done
-fi
-
 # Distro version that this script is running on.
 DISTRO_VERSION=${ID}-${VERSION_ID}
 
diff --git a/schutzbot/mockbuild.sh b/schutzbot/mockbuild.sh
index 52ab2dc36..d1414771e 100755
--- a/schutzbot/mockbuild.sh
+++ b/schutzbot/mockbuild.sh
@@ -71,7 +71,6 @@ if [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 8 ]] && ! rpm -q
     sudo rpm -Uvh /tmp/epel.rpm
 elif [[ $ID == rhel || $ID == centos ]] && [[ ${VERSION_ID%.*} == 9 ]]; then
     # we have our own small epel for EL9, let's install it
-
     # install Red Hat certificate, otherwise dnf copr fails
     curl -LO --insecure https://hdn.corp.redhat.com/rhel8-csb/RPMS/noarch/redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm
     sudo dnf install -y ./redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm dnf-plugins-core