From ee5b5bcf213dffe53c863227f49c30a699042755 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Wed, 19 Jan 2022 09:43:18 +0100
Subject: [PATCH 1/2] LOS-867: mirror RedHat UBI content

---
 dev.repos.d/redhat-ubi-7-x86_64.repo | 125 +++++++++++++++++++++++++++
 dev.repos.d/redhat-ubi-8-x86_64.repo |  62 +++++++++++++
 dev.repos.yaml                       |   8 ++
 prod.repos.yaml                      |   6 ++
 4 files changed, 201 insertions(+)
 create mode 100644 dev.repos.d/redhat-ubi-7-x86_64.repo
 create mode 100644 dev.repos.d/redhat-ubi-8-x86_64.repo

diff --git a/dev.repos.d/redhat-ubi-7-x86_64.repo b/dev.repos.d/redhat-ubi-7-x86_64.repo
new file mode 100644
index 0000000..00f241b
--- /dev/null
+++ b/dev.repos.d/redhat-ubi-7-x86_64.repo
@@ -0,0 +1,125 @@
+[ubi-7]
+name = Red Hat Universal Base Image 7 Server (RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-debug-rpms]
+name = Red Hat Universal Base Image 7 Server (Debug RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-source-rpms]
+name = Red Hat Universal Base Image 7 Server (Source RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-optional-rpms]
+name = Red Hat Universal Base Image 7 Server - Optional (RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/optional/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-optional-debug-rpms]
+name = Red Hat Universal Base Image 7 Server - Optional (Debug RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/optional/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-optional-source-rpms]
+name = Red Hat Universal Base Image 7 Server - Optional (Source RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/optional/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-extras-rpms]
+name = Red Hat Universal Base Image 7 Server - Extras (RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/extras/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-extras-debug-rpms]
+name = Red Hat Universal Base Image 7 Server - Extras (Debug RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/extras/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-extras-source-rpms]
+name = Red Hat Universal Base Image 7 Server - Extras (Source RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/extras/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-rhah]
+name = Red Hat Universal Base Image Atomic Host (RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/atomic/7/7Server/x86_64/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-rhah-debug]
+name = Red Hat Universal Base Image Atomic Host (Debug RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/atomic/7/7Server/x86_64/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-rhah-source]
+name = Red Hat Universal Base Image Atomic Host (Source RPMs)
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/atomic/7/7Server/x86_64/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-server-rhscl-7-rpms]
+name = Red Hat Software Collections RPMs for Red Hat Universal Base Image 7 Server
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/rhscl/1/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-server-rhscl-7-debug-rpms]
+name = Red Hat Software Collections Debug RPMs for Red Hat Universal Base Image 7 Server
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/rhscl/1/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-server-rhscl-7-source-rpms]
+name = Red Hat Software Collections Source RPMs for Red Hat Universal Base Image 7 Server
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/rhscl/1/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-devtools-rpms]
+name = Red Hat Developer Tools RPMs for Red Hat Universal Base Image 7 Server
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/devtools/1/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-devtools-debug-rpms]
+name = Red Hat Developer Tools Debug RPMs for Red Hat Universal Base Image 7 Server
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/devtools/1/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-7-server-devtools-source-rpms]
+name = Red Hat Developer Tools Source RPMs for Red Hat Universal Base Image 7 Server
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi/server/7/7Server/x86_64/devtools/1/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
diff --git a/dev.repos.d/redhat-ubi-8-x86_64.repo b/dev.repos.d/redhat-ubi-8-x86_64.repo
new file mode 100644
index 0000000..8799dc1
--- /dev/null
+++ b/dev.repos.d/redhat-ubi-8-x86_64.repo
@@ -0,0 +1,62 @@
+[ubi-8-baseos]
+name = Red Hat Universal Base Image 8 (RPMs) - BaseOS
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-baseos-debug]
+name = Red Hat Universal Base Image 8 (Debug RPMs) - BaseOS
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-baseos-source]
+name = Red Hat Universal Base Image 8 (Source RPMs) - BaseOS
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-appstream]
+name = Red Hat Universal Base Image 8 (RPMs) - AppStream
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-appstream-debug]
+name = Red Hat Universal Base Image 8 (Debug RPMs) - AppStream
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-appstream-source]
+name = Red Hat Universal Base Image 8 (Source RPMs) - AppStream
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-codeready-builder]
+name = Red Hat Universal Base Image 8 (RPMs) - CodeReady Builder
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/codeready-builder/os
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-codeready-builder-debug]
+name = Red Hat Universal Base Image 8 (Debug RPMs) - CodeReady Builder
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/codeready-builder/debug
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
+
+[ubi-8-codeready-builder-source]
+name = Red Hat Universal Base Image 8 (Source RPMs) - CodeReady Builder
+baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/codeready-builder/source/SRPMS
+enabled = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgcheck = 1
diff --git a/dev.repos.yaml b/dev.repos.yaml
index e10920a..1d990e9 100644
--- a/dev.repos.yaml
+++ b/dev.repos.yaml
@@ -44,3 +44,11 @@ rundeck-pagerduty.repo:
 redhat-5-els-x86_64.repo:
   checksum: 'sha'
   pathroot: ''
+
+redhat-ubi-7-x86_64.repo:
+  schedule: '30 8 * * *'
+  pathroot: ''
+
+redhat-ubi-8-x86_64.repo:
+  schedule: '30 8 * * *'
+  pathroot: ''
diff --git a/prod.repos.yaml b/prod.repos.yaml
index 0b9b644..4c742ed 100644
--- a/prod.repos.yaml
+++ b/prod.repos.yaml
@@ -150,6 +150,12 @@ redhat-8-x86_64.repo:
   run_customscript: true
   customscript: 'bash /root/rhn_update_cert_symlink.sh'
 
+redhat-ubi-7-x86_64.repo:
+  pathroot: ''
+
+redhat-ubi-8-x86_64.repo:
+  pathroot: ''
+
 tpc.repo:
   pathroot: 'mirror/tungsten'
   pathcut: '148.251.5.90'
-- 
GitLab


From 67774adfdde02dbb8002b04c9db00418ea7bf871 Mon Sep 17 00:00:00 2001
From: Ben Morrice <ben.morrice@cern.ch>
Date: Wed, 19 Jan 2022 10:53:05 +0100
Subject: [PATCH 2/2] Decommission ubi in dev, promote to prod

---
 dev.repos.yaml                                         | 8 --------
 {dev.repos.d => prod.repos.d}/redhat-ubi-7-x86_64.repo | 0
 {dev.repos.d => prod.repos.d}/redhat-ubi-8-x86_64.repo | 0
 3 files changed, 8 deletions(-)
 rename {dev.repos.d => prod.repos.d}/redhat-ubi-7-x86_64.repo (100%)
 rename {dev.repos.d => prod.repos.d}/redhat-ubi-8-x86_64.repo (100%)

diff --git a/dev.repos.yaml b/dev.repos.yaml
index 1d990e9..e10920a 100644
--- a/dev.repos.yaml
+++ b/dev.repos.yaml
@@ -44,11 +44,3 @@ rundeck-pagerduty.repo:
 redhat-5-els-x86_64.repo:
   checksum: 'sha'
   pathroot: ''
-
-redhat-ubi-7-x86_64.repo:
-  schedule: '30 8 * * *'
-  pathroot: ''
-
-redhat-ubi-8-x86_64.repo:
-  schedule: '30 8 * * *'
-  pathroot: ''
diff --git a/dev.repos.d/redhat-ubi-7-x86_64.repo b/prod.repos.d/redhat-ubi-7-x86_64.repo
similarity index 100%
rename from dev.repos.d/redhat-ubi-7-x86_64.repo
rename to prod.repos.d/redhat-ubi-7-x86_64.repo
diff --git a/dev.repos.d/redhat-ubi-8-x86_64.repo b/prod.repos.d/redhat-ubi-8-x86_64.repo
similarity index 100%
rename from dev.repos.d/redhat-ubi-8-x86_64.repo
rename to prod.repos.d/redhat-ubi-8-x86_64.repo
-- 
GitLab