Update the repomap.json file to address planned changes on RHUI Azure

- Resolves: rhbz#2203800

0005-Update-the-repomap.json-file-for-RHUI-Azure.patch

@@ -0,0 +1,118 @@
+From 1240116a7989f24f00a06273104f059449516365 Mon Sep 17 00:00:00 2001
+From: Petr Stodulka <pstodulk@redhat.com>
+Date: Mon, 5 Jun 2023 16:24:03 +0200
+Subject: [PATCH] Update the repomap.json file for RHUI Azure
+
+python repomap_diff.py old_repomap.json new_repomap.json
+Upg paths are unchanged.
+Mappings are unchanged.
+The following repos have been removed:
+ - Repo(pesid='rhel8-AppStream', major_version='8', repoid='rhui-rhel-8-for-x86_64-appstream-rhui-rpms', repo_type='rpm', channel='ga', arch='x86_64', rhui='azure')
+ - Repo(pesid='rhel8-BaseOS', major_version='8', repoid='rhui-rhel-8-for-x86_64-baseos-rhui-rpms', repo_type='rpm', channel='ga', arch='x86_64', rhui='azure')
+ - Repo(pesid='rhel8-CRB', major_version='8', repoid='rhui-codeready-builder-for-rhel-8-x86_64-rhui-rpms', repo_type='rpm', channel='ga', arch='x86_64', rhui='azure')
+The following repos have been added:
+ - Repo(pesid='rhel8-CRB', major_version='8', repoid='codeready-builder-for-rhel-8-x86_64-rhui-rpms', repo_type='rpm', channel='ga', arch='x86_64', rhui='azure')
+ - Repo(pesid='rhel8-BaseOS', major_version='8', repoid='rhel-8-for-x86_64-baseos-rhui-rpms', repo_type='rpm', channel='ga', arch='x86_64', rhui='azure')
+ - Repo(pesid='rhel8-AppStream', major_version='8', repoid='rhel-8-for-x86_64-appstream-rhui-rpms', repo_type='rpm', channel='ga', arch='x86_64', rhui='azure')
+---
+ etc/leapp/files/repomap.json | 44 ++++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/etc/leapp/files/repomap.json b/etc/leapp/files/repomap.json
+index 88116e2..14b6f0d 100644
+--- a/etc/leapp/files/repomap.json
++++ b/etc/leapp/files/repomap.json
+@@ -1,5 +1,5 @@
+ {
+-    "datetime": "202303072246Z",
++    "datetime": "202306051542Z",
+     "version_format": "1.0.0",
+     "mapping": [
+         {
+@@ -1409,6 +1409,14 @@
+                     "channel": "eus",
+                     "repo_type": "rpm"
+                 },
++                {
++                    "major_version": "8",
++                    "repoid": "rhel-8-for-x86_64-baseos-rhui-rpms",
++                    "arch": "x86_64",
++                    "channel": "ga",
++                    "repo_type": "rpm",
++                    "rhui": "azure"
++                },
+                 {
+                     "major_version": "8",
+                     "repoid": "rhel-8-for-x86_64-baseos-rpms",
+@@ -1432,14 +1440,6 @@
+                     "repo_type": "rpm",
+                     "rhui": "aws"
+                 },
+-                {
+-                    "major_version": "8",
+-                    "repoid": "rhui-rhel-8-for-x86_64-baseos-rhui-rpms",
+-                    "arch": "x86_64",
+-                    "channel": "ga",
+-                    "repo_type": "rpm",
+-                    "rhui": "azure"
+-                },
+                 {
+                     "major_version": "8",
+                     "repoid": "rhui-rhel-8-for-x86_64-baseos-rhui-rpms",
+@@ -1615,6 +1615,14 @@
+                     "channel": "eus",
+                     "repo_type": "rpm"
+                 },
++                {
++                    "major_version": "8",
++                    "repoid": "rhel-8-for-x86_64-appstream-rhui-rpms",
++                    "arch": "x86_64",
++                    "channel": "ga",
++                    "repo_type": "rpm",
++                    "rhui": "azure"
++                },
+                 {
+                     "major_version": "8",
+                     "repoid": "rhel-8-for-x86_64-appstream-rpms",
+@@ -1638,14 +1646,6 @@
+                     "repo_type": "rpm",
+                     "rhui": "aws"
+                 },
+-                {
+-                    "major_version": "8",
+-                    "repoid": "rhui-rhel-8-for-x86_64-appstream-rhui-rpms",
+-                    "arch": "x86_64",
+-                    "channel": "ga",
+-                    "repo_type": "rpm",
+-                    "rhui": "azure"
+-                },
+                 {
+                     "major_version": "8",
+                     "repoid": "rhui-rhel-8-for-x86_64-appstream-rhui-rpms",
+@@ -1762,18 +1762,18 @@
+                 },
+                 {
+                     "major_version": "8",
+-                    "repoid": "codeready-builder-for-rhel-8-x86_64-rpms",
++                    "repoid": "codeready-builder-for-rhel-8-x86_64-rhui-rpms",
+                     "arch": "x86_64",
+                     "channel": "ga",
+-                    "repo_type": "rpm"
++                    "repo_type": "rpm",
++                    "rhui": "azure"
+                 },
+                 {
+                     "major_version": "8",
+-                    "repoid": "rhui-codeready-builder-for-rhel-8-x86_64-rhui-rpms",
++                    "repoid": "codeready-builder-for-rhel-8-x86_64-rpms",
+                     "arch": "x86_64",
+                     "channel": "ga",
+-                    "repo_type": "rpm",
+-                    "rhui": "azure"
++                    "repo_type": "rpm"
+                 },
+                 {
+                     "major_version": "8",
+-- 
+2.40.1
+

leapp-repository.spec

@@ -42,7 +42,7 @@ py2_byte_compile "%1" "%2"}
 
 Name:           leapp-repository
 Version:        0.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Repositories for leapp
 
 License:        ASL 2.0
@@ -59,6 +59,7 @@ Patch0001:      0001-Introduce-leapp-data-in-the-RPM-repository.patch
 Patch0002:      0002-Add-el8toel9-actor-to-handle-directory-symlink.patch
 Patch0003:      0003-Enable-8-9-upgrades-with-FIPS-enabled-1053.patch
 Patch0004:      0004-Change-the-upgrade-paths-for-SAP-HANA.patch
+Patch0005:      0005-Update-the-repomap.json-file-for-RHUI-Azure.patch
 
 
 
@@ -207,6 +208,7 @@ Requires:   python3-gobject-base
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
+%patch0005 -p1
 
 
 %build
@@ -284,6 +286,10 @@ done;
 # no files here
 
 %changelog
+* Mon Jun 05 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-3
+- Update the repomap.json file to address planned changes on RHUI Azure
+- Resolves: rhbz#2203800
+
 * Fri May 19 2023 Petr Stodulka <pstodulk@redhat.com> - 0.18.0-2
 - Include leap data files in the package
 - Introduce in-place upgrades for systems with enabled FIPS mode