.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/deps-pkgs-13.tar.gz
+/deps-pkgs-10.tar.gz
-SOURCES/leapp-repository-0.22.0.tar.gz
+/leapp-repository-0.21.0.tar.gz

.leapp-repository.metadata

@@ -1,2 +0,0 @@
-3590b33b4a79ebe62f5cfa0eeca7efb41d526498 SOURCES/deps-pkgs-13.tar.gz
-e23b32573b375337b079dd7a0dc07e9232851b1c SOURCES/leapp-repository-0.22.0.tar.gz

0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch

@@ -0,0 +1,43 @@
+From fbc38d4ad1d828e0553579e3719c0e4ed4a2a6bd Mon Sep 17 00:00:00 2001
+From: jinkangkang <1547182170@qq.com>
+Date: Mon, 19 Aug 2024 18:46:08 +0800
+Subject: [PATCH] rhui(alibaba): add ARM RHEL8 and RHEL9 setup entries (#1277)
+
+Since leapp's RHUI mechanism filters setups based on the architecture of the source system,
+it was not possible to upgrade of ARM-based RHEL systems on Alibaba cloud as there
+were no ARM entries in RHUI_SETUPS. This patch adds these entries, making it possible
+for EL 8 -> 9 upgrades of ARM systems on Alibaba cloud.
+---
+ repos/system_upgrade/common/libraries/rhui.py | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/repos/system_upgrade/common/libraries/rhui.py b/repos/system_upgrade/common/libraries/rhui.py
+index 51694ac2..30de0275 100644
+--- a/repos/system_upgrade/common/libraries/rhui.py
++++ b/repos/system_upgrade/common/libraries/rhui.py
+@@ -348,6 +348,22 @@ RHUI_SETUPS = {
+                         ('content.crt', RHUI_PKI_PRODUCT_DIR)
+                       ],
+                       os_version='9'),
++    ],
++    RHUIFamily(RHUIProvider.ALIBABA, arch=arch.ARCH_ARM64, client_files_folder='alibaba'): [
++        mk_rhui_setup(clients={'aliyun_rhui_rhel8'}, leapp_pkg='leapp-rhui-alibaba',
++                      mandatory_files=[('leapp-alibaba.repo', YUM_REPOS_PATH)],
++                      optional_files=[
++                        ('key.pem', RHUI_PKI_DIR),
++                        ('content.crt', RHUI_PKI_PRODUCT_DIR)
++                      ],
++                      os_version='8'),
++        mk_rhui_setup(clients={'aliyun_rhui_rhel9'}, leapp_pkg='leapp-rhui-alibaba',
++                      mandatory_files=[('leapp-alibaba.repo', YUM_REPOS_PATH)],
++                      optional_files=[
++                        ('key.pem', RHUI_PKI_DIR),
++                        ('content.crt', RHUI_PKI_PRODUCT_DIR)
++                      ],
++                      os_version='9'),
+     ]
+ }
+ 
+-- 
+2.45.2
+

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+

leapp-repository.spec

@@ -51,20 +51,21 @@ py2_byte_compile "%1" "%2"}
 # RHEL 8+ packages to be consistent with other leapp projects in future.
 
 Name:           leapp-repository
-Version:        0.22.0
+Version:        0.21.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Repositories for leapp
 
 License:        ASL 2.0
 URL:            https://oamg.github.io/leapp/
 Source0:        https://github.com/oamg/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        deps-pkgs-13.tar.gz
+Source1:        deps-pkgs-10.tar.gz
 
 # NOTE: Our packages must be noarch. Do no drop this in any way.
 BuildArch:      noarch
 
 ### PATCHES HERE
 # Patch0001:    filename.patch
+Patch0001:      0001-rhui-alibaba-add-ARM-RHEL8-and-RHEL9-setup-entries-1.patch
 
 
 %description
@@ -120,7 +121,7 @@ Requires:       leapp-repository-dependencies = %{leapp_repo_deps}
 
 # IMPORTANT: this is capability provided by the leapp framework rpm.
 # Check that 'version' instead of the real framework rpm version.
-Requires:       leapp-framework >= 6.0
+Requires:       leapp-framework >= 5.0
 
 # Since we provide sub-commands for the leapp utility, we expect the leapp
 # tool to be installed as well.
@@ -211,12 +212,6 @@ Requires:   dracut
 Requires:   NetworkManager-libnm
 Requires:   python3-gobject-base
 
-%endif
-
-%if 0%{?rhel} && 0%{?rhel} == 9
-############# RHEL 9 dependencies (when the source system is RHEL 9) ##########
-# Required to convert pam_userdb database from BerkeleyDB to GDBM
-Requires:   libdb-utils
 %endif
 ##################################################
 # end requirement
@@ -233,6 +228,7 @@ Requires:   libdb-utils
 
 # APPLY PATCHES HERE
 # %%patch0001 -p1
+%patch0001 -p1
 
 
 %build
@@ -250,9 +246,6 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/leapp/files/
 install -m 0644 etc/leapp/transaction/* %{buildroot}%{_sysconfdir}/leapp/transaction
 install -m 0644 etc/leapp/files/* %{buildroot}%{_sysconfdir}/leapp/files
 
-# uncomment to install existing configs if any exists
-#install -m 0644 etc/leapp/actor_conf.d/* %%{buildroot}%%{_sysconfdir}/leapp/actor_conf.d
-
 # install CLI commands for the leapp utility on the expected path
 install -m 0755 -d %{buildroot}%{leapp_python_sitelib}/leapp/cli/
 cp -r commands %{buildroot}%{leapp_python_sitelib}/leapp/cli/
@@ -271,9 +264,6 @@ find %{buildroot}%{repositorydir}/common -name "test.py" -delete
 rm -rf `find %{buildroot}%{repositorydir} -name "tests" -type d`
 find %{buildroot}%{repositorydir} -name "Makefile" -delete
 find %{buildroot} -name "*.py.orig" -delete
-# .gitkeep file is used to have a directory in the repo. but we do not want these
-# files in the resulting RPM
-find %{buildroot} -name .gitkeep -delete
 
 for DIRECTORY in $(find  %{buildroot}%{repositorydir}/  -mindepth 1 -maxdepth 1 -type d);
 do
@@ -302,8 +292,6 @@ done;
 %dir %{custom_repositorydir}
 %dir %{leapp_python_sitelib}/leapp/cli/commands
 %config %{_sysconfdir}/leapp/files/*
-# uncomment to package installed configs
-#%%config %%{_sysconfdir}/leapp/actor_conf.d/*
 %{_sysconfdir}/leapp/repos.d/*
 %{_sysconfdir}/leapp/transaction/*
 %{repositorydir}/*
@@ -314,47 +302,6 @@ done;
 # no files here
 
 %changelog
-* Fri Feb 14 2025 Petr Stodulka <pstodulk@redhat.com> - 0.22.0-1
-- Rebase to new upstream 0.22.0
-- Minor updates in generated reports
-- Resolves: RHEL-67621, RHEL-67719, RHEL-16881
-
-* Wed Jan 29 2025 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-6
-- Raise an inhibitor if unsupported target version supplied instead of error
-- Prevent a possible crash with LiveMode when adding the upgrade boot entry on systems with LVM
-- Fix the bootloader workaround for upgrades on ARM machines - covering also differences on AWS
-- Resolves: RHEL-67621, RHEL-51072, RHEL-41193
-
-* Fri Jan 17 2025 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-5
-- Fix pes events scanner crashing when there are duplicate packages in the received instructions
-- Fix pes events scanner not respecting user’s transaction configuration
-- Fix storage scanner crashing when command outputs contain colon character
-- Activate LVM VGs with `--sysinit` option to correct the use in the upgrade initramfs
-- Minor improvements in preupgrade reports
-- Resolves: RHEL-67621, RHEL-34570, RHEL-44596, RHEL-50076
-
-* Tue Nov 19 2024 Matej Matuska <mmatuska@redhat.com> - 0.21.0-4
-- Use net.naming-scheme by default
-- Resolves: RHEL-23473
-
-* Mon Nov 18 2024 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-3
-- Introduce upgrade path 8.10 -> 9.6
-- Require leapp-framework 6.0+
-- Update leapp-deps package to satisfy leapp-framework-dependencies 6
-- Add possibility to use net.naming-scheme during the upgrade
-- Cap max size of the sparse files to 1TiB for storage with large amount of free space
-- Enable upgrade for systems with LUKS bound to Clevis with TPM 2.0 token
-- Adjust resource limitations for leapp to be able to perform the upgrade
-- Fix problems with the bootloader when upgrading to RHEL 9.6 on ARM
-- Fix the report when handling broken parsing of kernel cmdline
-- Generate proper error message instead of ModelViolationError when parsing invalid repository definition
-- Handle default kernel cmdline when multiple boot entries for the default kernel are defined
-- Introduce a possibility to configure leapp actors covering RHUI on clouds
-- Skip checking of (PKI) `directory-hash` dir to speedup the upgrade process and clean logs
-- Update leapp upgrade data files
-- Resolves: RHEL-67621, RHEL-57064, RHEL-56251, RHEL-50686, RHEL-41193
-- Resolves: RHEL-34570, RHEL-26459, RHEL-23473, RHEL-16881, RHEL-3294
-
 * Mon Aug 19 2024 Petr Stodulka <pstodulk@redhat.com> - 0.21.0-2
 - Updated SPEC file to drop leapp repositories unrelated to IPU 8 -> 9
 - Resolves: RHEL-27847

plans/tier0.fmf

@@ -0,0 +1,73 @@
+# These test plans were created manually based on information taken from
+# https://gitlab.cee.redhat.com/oamg/leapp-tests/-/blob/main/config.yaml. The tmt definitions can be simplified, once
+# https://github.com/teemtee/tmt/issues/1770 is implemented.
+
+summary: Internal Tier0 tests
+
+environment:
+    SOURCE_RELEASE: '8.10'
+    TARGET_RELEASE: '9.5'
+
+context:
+    distro: rhel-8.10
+    distro_target: rhel-9.5
+
+adjust:
+    enabled: false
+    when: distro == centos-stream-8
+
+/customrepos_upgrade_happy_path:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/destructive/customrepos/basic_upgrade/upgrade_happy_path
+            ref: main
+
+/oamg3661_two_reboots:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/destructive/customrepos/oamg/oamg3661_two_reboots
+            ref: main
+
+/oamg9094_datainrpm_predownload_then_install:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/destructive/customrepos/oamg/oamg9094_datainrpm_predownload_then_install
+            ref: main
+
+/oamg9299_devtmpfs_in_fstab:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/destructive/customrepos/oamg/oamg9299_devtmpfs_in_fstab
+            ref: main
+
+/rhsm_upgrade_happy_path:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/destructive/rhsm/upgrade_happy_path
+            ref: main
+
+/customrepos_tier0only:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/nondestructive/customrepos/tier0only
+            ref: main
+
+/none_tier0only:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/nondestructive/none/tier0only
+            ref: main
+
+/rhsm_tier0only:
+    plan:
+        import:
+            url: https://gitlab.cee.redhat.com/oamg/leapp-tests
+            name: /plans/nondestructive/rhsm/tier0only
+            ref: main

sources

@@ -0,0 +1,2 @@
+SHA512 (deps-pkgs-10.tar.gz) = e63f77e439456e0a8b0fc338b370ee7e2d7824b1d62c75f2209b283905c8c0641d504bfe910021317884fa1662429d952fd4c9b9ee457c48b34182e6f975aa0e
+SHA512 (leapp-repository-0.21.0.tar.gz) = 57cbc9cf3395ade0f2f0ec90d0000e9bcf3eba7c40473bfe930dac648c7ae21cb07d3a5b30e1eb72c4c3e24a49778d81a5c322a4a5956678a5c1705c524d11f6