153 lines
5.4 KiB
Diff
153 lines
5.4 KiB
Diff
|
From 8d84c02b92f3a7a7d74a272aa31d5b0a0f24faea Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matej Matuska <mmatuska@redhat.com>
|
||
|
|
Date: Thu, 11 Apr 2024 15:56:51 +0200
|
||
|
|
Subject: [PATCH 16/34] repomapping: Add RHEL7 ELS repos
|
||
|
|
|
||
|
|
RHEL-21891
|
||
|
|
---
|
||
|
|
etc/leapp/files/repomap.json | 60 ++++++++++++++++++-
|
||
|
|
.../common/models/repositoriesmap.py | 2 +-
|
||
|
|
2 files changed, 59 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/etc/leapp/files/repomap.json b/etc/leapp/files/repomap.json
|
||
|
|
index 57cab1ad..1ee6c56a 100644
|
||
|
|
--- a/etc/leapp/files/repomap.json
|
||
|
|
+++ b/etc/leapp/files/repomap.json
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
{
|
||
|
|
- "datetime": "202401261328Z",
|
||
|
|
- "version_format": "1.2.0",
|
||
|
|
+ "datetime": "202404091246Z",
|
||
|
|
+ "version_format": "1.2.1",
|
||
|
|
"mapping": [
|
||
|
|
{
|
||
|
|
"source_major_version": "7",
|
||
|
|
@@ -303,6 +303,13 @@
|
||
|
|
"channel": "beta",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-7-for-system-z-els-rpms",
|
||
|
|
+ "arch": "s390x",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-7-for-system-z-eus-rpms",
|
||
|
|
@@ -346,6 +353,13 @@
|
||
|
|
"channel": "e4s",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-7-server-els-rpms",
|
||
|
|
+ "arch": "x86_64",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-7-server-eus-rpms",
|
||
|
|
@@ -486,6 +500,13 @@
|
||
|
|
"channel": "ga",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-7-for-system-z-els-optional-rpms",
|
||
|
|
+ "arch": "s390x",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-7-for-system-z-eus-optional-rpms",
|
||
|
|
@@ -529,6 +550,13 @@
|
||
|
|
"channel": "e4s",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-7-server-els-optional-rpms",
|
||
|
|
+ "arch": "x86_64",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-7-server-eus-optional-rpms",
|
||
|
|
@@ -892,6 +920,13 @@
|
||
|
|
"channel": "beta",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-sap-for-rhel-7-for-system-z-els-rpms",
|
||
|
|
+ "arch": "s390x",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-sap-for-rhel-7-for-system-z-eus-rpms",
|
||
|
|
@@ -920,6 +955,13 @@
|
||
|
|
"channel": "e4s",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-sap-for-rhel-7-server-els-rpms",
|
||
|
|
+ "arch": "x86_64",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-sap-for-rhel-7-server-eus-rhui-rpms",
|
||
|
|
@@ -1022,6 +1064,13 @@
|
||
|
|
"channel": "e4s",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-sap-hana-for-rhel-7-server-els-rpms",
|
||
|
|
+ "arch": "x86_64",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-sap-hana-for-rhel-7-server-eus-rhui-rpms",
|
||
|
|
@@ -1125,6 +1174,13 @@
|
||
|
|
"channel": "e4s",
|
||
|
|
"repo_type": "rpm"
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ "major_version": "7",
|
||
|
|
+ "repoid": "rhel-ha-for-rhel-7-server-els-rpms",
|
||
|
|
+ "arch": "x86_64",
|
||
|
|
+ "channel": "els",
|
||
|
|
+ "repo_type": "rpm"
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
"major_version": "7",
|
||
|
|
"repoid": "rhel-ha-for-rhel-7-server-eus-rhui-rpms",
|
||
|
|
diff --git a/repos/system_upgrade/common/models/repositoriesmap.py b/repos/system_upgrade/common/models/repositoriesmap.py
|
||
|
|
index 7ef0bdb4..7192a60d 100644
|
||
|
|
--- a/repos/system_upgrade/common/models/repositoriesmap.py
|
||
|
|
+++ b/repos/system_upgrade/common/models/repositoriesmap.py
|
||
|
|
@@ -61,7 +61,7 @@ class PESIDRepositoryEntry(Model):
|
||
|
|
too.
|
||
|
|
"""
|
||
|
|
|
||
|
|
- channel = fields.StringEnum(['ga', 'e4s', 'eus', 'aus', 'beta'])
|
||
|
|
+ channel = fields.StringEnum(['ga', 'e4s', 'eus', 'aus', 'beta', 'els'])
|
||
|
|
"""
|
||
|
|
The 'channel' of the repository.
|
||
|
|
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|