Rebase on upstream most recent version 0.22.0-5 (93cae9c88e964d6485ad8314ae65deb0ab676862)

.github/workflows/pr-welcome-msg.yml

@@ -19,7 +19,7 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             ## **Thank you for contributing to the Leapp project!**
-            Please note that every PR needs to comply with the [Leapp Guidelines](https://leapp.readthedocs.io/en/latest/contributing.html#) and must pass all tests in order to be mergeable.
+            Please note that every PR needs to comply with the [leapp-repository contribution and development guidelines](https://leapp-repository.readthedocs.io/latest/contrib-and-devel-guidelines.html) and must pass all tests in order to be mergeable.
             If you want to request a review or rebuild a package in copr, you can use following commands as a comment:
             - **`review please @oamg/developers`** to notify leapp developers of the review request
             - **`/packit copr-build`** to submit a public copr build using packit
@@ -39,6 +39,6 @@ jobs:
 
             See other labels for particular jobs defined in the `.packit.yaml` file.
 
-            Please [open ticket](https://url.corp.redhat.com/oamg-ci-issue) in case you experience technical problem with the CI. (RH internal only)
+            Please [open ticket](https://red.ht/rhel-upgrades-ci-issue) in case you experience technical problem with the CI. (RH internal only)
 
             **Note:** In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please contact leapp-infra.

CONTRIBUTING.md

@@ -1 +1 @@
-See the [Contribution guidelines](https://leapp.readthedocs.io/en/latest/contributing.html)
+See the [contribution guidelines](https://leapp-repository.readthedocs.io/latest/contrib-and-devel-guidelines.html).

Makefile

@@ -3,7 +3,7 @@ SHELL=/bin/bash
 
 __PKGNAME=$${_PKGNAME:-leapp-repository}
 VENVNAME ?= tut
-DIST_VERSION ?= 7
+DIST_VERSION ?= 8
 PKGNAME=leapp-repository
 DEPS_PKGNAME=leapp-el7toel8-deps
 VERSION=`grep -m1 "^Version:" packaging/$(PKGNAME).spec | grep -om1 "[0-9].[0-9.]**"`
@@ -23,7 +23,7 @@ PYLINT_ARGS ?=
 FLAKE8_ARGS ?=
 
 # python version to run test with
-_PYTHON_VENV=$${PYTHON_VENV:-python2.7}
+_PYTHON_VENV=$${PYTHON_VENV:-python3.6}
 
 ifdef ACTOR
 	TEST_PATHS=`$(_PYTHON_VENV) utils/actor_path.py $(ACTOR)`
@@ -55,9 +55,9 @@ _TEST_CONTAINER=$${TEST_CONTAINER:-rhel8}
 
 # In case just specific CHROOTs should be used for the COPR build, you can
 # set the multiple CHROOTs separated by comma in the COPR_CHROOT envar, e.g.
-# "epel-7-x86_64,epel-8-x86_64". But for the copr-cli utility, each of them
+# "epel-8-x86_64,epel-9-x86_64". But for the copr-cli utility, each of them
 # has to be specified separately for the -r option; So we transform it
-# automatically to "-r epel-7-x86_64 -r epel-8-x86_64" (without quotes).
+# automatically to "-r epel-8-x86_64 -r epel-9-x86_64" (without quotes).
 ifdef COPR_CHROOT
 	_COPR_CHROOT=`echo $${COPR_CHROOT} | grep -o "[^,]*" | sed "s/^/-r /g"`
 endif
@@ -111,7 +111,7 @@ help:
 	@echo "                              packaging"
 	@echo "  srpm                        create the SRPM"
 	@echo "  build_container             create the RPM in container"
-	@echo "                              - set BUILD_CONTAINER to el7, el8 or el9"
+	@echo "                              - set BUILD_CONTAINER to el8 or el9"
 	@echo "                              - don't run more than one build at the same time"
 	@echo "                                since containers operate on the same files!"
 	@echo "  copr_build                  create the COPR build using the COPR TOKEN"
@@ -154,7 +154,7 @@ help:
 	@echo "  COPR_CONFIG           path to the COPR config with API token"
 	@echo "                          (default: ~/.config/copr_rh_oamg.conf)"
 	@echo "  COPR_CHROOT           specify the CHROOT which should be used for"
-	@echo "                        the build, e.g. 'epel-7-x86_64'. You can"
+	@echo "                        the build, e.g. 'epel-8-x86_64'. You can"
 	@echo "                        specify multiple CHROOTs separated by comma."
 	@echo ""
 	@echo "Possible use:"
@@ -189,7 +189,6 @@ source: prepare
 	@git archive --prefix "$(PKGNAME)-$(VERSION)/" -o "packaging/sources/$(PKGNAME)-$(VERSION).tar.gz" HEAD
 	@echo "--- PREPARE DEPS PKGS ---"
 	mkdir -p packaging/tmp/
-	@__TIMESTAMP=$(TIMESTAMP) $(MAKE) DIST_VERSION=7 _build_subpkg
 	@__TIMESTAMP=$(TIMESTAMP) $(MAKE) DIST_VERSION=8 _build_subpkg
 	@__TIMESTAMP=$(TIMESTAMP) $(MAKE) DIST_VERSION=9 _build_subpkg
 	@tar -czf packaging/sources/deps-pkgs.tar.gz -C packaging/RPMS/noarch `ls -1 packaging/RPMS/noarch | grep -o "[^/]*rpm$$"`
@@ -250,11 +249,8 @@ _build_local: source
 	@mv packaging/$(PKGNAME).spec.bak packaging/$(PKGNAME).spec
 
 build_container:
-	echo "--- Build RPM ${PKGNAME}-${VERSION}-${RELEASE}.el$(DIST_VERSION).rpm in container ---"; \
+	echo "--- Build RPM ${PKGNAME}-${VERSION}-${RELEASE}.el$(DIST_VERSION).rpm in container ---";
 	case "$(BUILD_CONTAINER)" in \
-		el7) \
-			CONT_FILE="utils/container-builds/Containerfile.centos7"; \
-			;; \
 		el8) \
 			CONT_FILE="utils/container-builds/Containerfile.ubi8"; \
 			;; \
@@ -266,7 +262,7 @@ build_container:
 			exit 1; \
 			;; \
 		*) \
-			echo "Available containers are el7, el8, el9"; \
+			echo "Available containers are el8, el9"; \
 			exit 1; \
 			;; \
 	esac && \
@@ -375,13 +371,15 @@ lint_fix:
 	echo "--- isort inplace fixing done. ---;"
 
 test_no_lint:
-	. $(VENVNAME)/bin/activate; \
+	@. $(VENVNAME)/bin/activate; \
 	snactor repo find --path repos/; \
-	cd repos/system_upgrade/el7toel8/; \
-	snactor workflow sanity-check ipu && \
-	cd - && \
+	for dir in repos/system_upgrade/*/; do \
+		echo "Running sanity-check in $$dir"; \
+		(cd $$dir && snactor workflow sanity-check ipu); \
+	done; \
 	$(_PYTHON_VENV) -m pytest $(REPORT_ARG) $(TEST_PATHS) $(LIBRARY_PATH) $(PYTEST_ARGS)
 
+
 test: lint test_no_lint
 
 # container images act like a cache so that dependencies can only be downloaded once
@@ -396,9 +394,6 @@ _build_container_image:
 # tests one IPU, leapp repositories irrelevant to the tested IPU are deleted
 _test_container_ipu:
 	@case $$TEST_CONT_IPU in \
-	el7toel8) \
-		export REPOSITORIES="common,el7toel8"; \
-		;; \
 	el8toel9) \
 		export REPOSITORIES="common,el8toel9"; \
 		;; \
@@ -409,7 +404,7 @@ _test_container_ipu:
 		echo "TEST_CONT_IPU must be set"; exit 1; \
 		;; \
 	*) \
-		echo "Only supported TEST_CONT_IPUs are el7toel8, el8toel9, el9toel10"; exit 1; \
+		echo "Only supported TEST_CONT_IPUs are el8toel9, el9toel10"; exit 1; \
 		;; \
 	esac && \
 	$(_CONTAINER_TOOL) exec -w /repocopy $$_CONT_NAME make clean && \
@@ -421,25 +416,20 @@ lint_container:
 	@_TEST_CONT_TARGET="lint" $(MAKE) test_container
 
 lint_container_all:
-	@for container in "f34" "rhel7" "rhel8"; do \
+	@for container in "f34" "rhel8" "rhel9"; do \
 		TEST_CONTAINER=$$container $(MAKE) lint_container || exit 1; \
 	done
 
 # Runs tests in a container
 # Builds testing image first if it doesn't exist
 # On some Python versions, we need to test both IPUs,
-# because e.g. RHEL7 to RHEL8 IPU must work on python2.7 and python3.6
-# and RHEL8 to RHEL9 IPU must work on python3.6 and python3.9.
+# because e.g RHEL8 to RHEL9 IPU must work on python3.6 and python3.9.
 test_container:
 	@case $(_TEST_CONTAINER) in \
 	f34) \
 		export CONT_FILE="utils/container-tests/Containerfile.f34"; \
 		export _VENV="python3.9"; \
 		;; \
-	rhel7) \
-		export CONT_FILE="utils/container-tests/Containerfile.rhel7"; \
-		export _VENV="python2.7"; \
-		;; \
 	rhel8) \
 		export CONT_FILE="utils/container-tests/Containerfile.rhel8"; \
 		export _VENV="python3.6"; \
@@ -449,7 +439,7 @@ test_container:
 		export _VENV="python3.9"; \
 		;; \
 	*) \
-		echo "Error: Available containers are: f34, rhel7, rhel8"; exit 1; \
+		echo "Error: Available containers are: f34, rhel8, rhel9"; exit 1; \
 		;; \
 	esac; \
 	export TEST_IMAGE="leapp-repo-tests-$(_TEST_CONTAINER)"; \
@@ -461,11 +451,7 @@ test_container:
 	$(_CONTAINER_TOOL) exec $$_CONT_NAME rsync -aur --delete --exclude "tut*" /repo/ /repocopy && \
 	export res=0; \
 	case $$_VENV in \
-	python2.7) \
-		TEST_CONT_IPU=el7toel8 $(MAKE) _test_container_ipu || res=1; \
-		;;\
 	python3.6) \
-		echo "INFO: Skipping testing of el7toel8 repository. Obsoleted"; \
 		TEST_CONT_IPU=el8toel9 $(MAKE) _test_container_ipu || res=1; \
 		;; \
 	python3.9) \
@@ -485,22 +471,22 @@ test_container:
 	exit $$res
 
 test_container_all:
-	@for container in "f34" "rhel7" "rhel8" "rhel9"; do \
+	@for container in "f34" "rhel8" "rhel9"; do \
 		TEST_CONTAINER=$$container $(MAKE) test_container || exit 1; \
 	done
 
 test_container_no_lint:
 	@_TEST_CONT_TARGET="test_no_lint" $(MAKE) test_container
 
 test_container_all_no_lint:
-	@for container in "f34" "rhel7" "rhel8" "rhel9"; do \
+	@for container in "f34" "rhel8" "rhel9"; do \
 		TEST_CONTAINER=$$container $(MAKE) test_container_no_lint || exit 1; \
 	done
 
 # clean all testing and building containers and their images
 clean_containers:
-	@for i in "leapp-repo-tests-f34" "leapp-repo-tests-rhel7" "leapp-repo-tests-rhel8" \
-	"leapp-repo-tests-rhel9" "leapp-repo-build-el7" "leapp-repo-build-el8"; do \
+	@for i in "leapp-repo-tests-f34" "leapp-repo-tests-rhel8" \
+	"leapp-repo-tests-rhel9" "leapp-repo-build-el8"; do \
 		$(_CONTAINER_TOOL) kill "$$i-cont" || :; \
 		$(_CONTAINER_TOOL) rm "$$i-cont" || :; \
 		$(_CONTAINER_TOOL) rmi "$$i" || :;  \

README.md

@@ -1,6 +1,6 @@
-**Before doing anything, please read the upstream [documentation](https://leapp-repository.readthedocs.io/).**
+**Before doing anything, please read the [leapp-repository documentation](https://leapp-repository.readthedocs.io/).**
 
-Also, you could find useufl to read [Leapp framework documentation](https://leapp.readthedocs.io/).
+Also, you could find the [Leapp framework documentation](https://leapp.readthedocs.io/) useful to read.
 
 ---
 
@@ -17,7 +17,7 @@ Also, you could find useufl to read [Leapp framework documentation](https://leap
   - *All files in /var/log/leapp*
   - */var/lib/leapp/leapp.db*
   - *journalctl*
-  - If you want, you can optionally send anything else would you like to provide (e.g. storage info)
+  - If you want, you can optionally send any other relevant information (e.g. storage, network)
 
 **For your convenience you can pack all logs with this command:**
 

commands/command_utils.py

@@ -59,7 +59,9 @@ def assert_version_format(version_str, desired_format, version_kind):
     :raises: CommandError
     """
     if not re.match(desired_format.regex, version_str):
-        error_str = 'Unexpected format of target version: {0}. The required format is \'{1}\'.'
+        error_str = (
+            'Unexpected format of target version: {0}. The required format is \'{1}\'.'
+        )
         raise CommandError(error_str.format(version_str, desired_format.human_readable))
 
 
@@ -182,26 +184,32 @@ def get_target_version(flavour):
     return target_versions[-1] if target_versions else None
 
 
-def vet_upgrade_path(args):
+def get_target_release(args):
     """
-    Make sure the user requested upgrade_path is a supported one.
-    If LEAPP_DEVEL_TARGET_RELEASE is set then it's value is not vetted against upgrade_paths_map but used as is.
+    Return the user selected target release or choose one from config.
+
+    A target release can be specified, ordered by priority, by the
+    LEAPP_DEVEL_TARGET_RELEASE or args.target (--target cmdline arg) or in the
+    config file.
+
+    NOTE: when specified via the env var or cmdline arg, the version isn't
+    checked against supported versions, this is done later by an actor in the
+    upgrade process.
 
     :return: `tuple` (target_release, flavor)
     """
     flavor = get_upgrade_flavour()
     env_version_override = os.getenv('LEAPP_DEVEL_TARGET_RELEASE')
 
-    if env_version_override:
+    target_ver = env_version_override or args.target
+    if target_ver:
         os_release_contents = _retrieve_os_release_contents()
         distro_id = os_release_contents.get('ID', '')
         expected_version_format = _DISTRO_VERSION_FORMATS.get(distro_id, VersionFormats.MAJOR_MINOR).value
-        assert_version_format(env_version_override, expected_version_format, _VersionKind.TARGET)
-
-        return (env_version_override, flavor)
+        assert_version_format(target_ver, expected_version_format, _VersionKind.TARGET)
+        return (target_ver, flavor)
 
-    target_release = args.target or get_target_version(flavor)
-    return (target_release, flavor)
+    return (get_target_version(flavor), flavor)
 
 
 def set_resource_limits():

commands/tests/test_upgrade_paths.py

@@ -1,3 +1,4 @@
+import os
 import resource
 
 import mock
@@ -29,34 +30,53 @@ def test_get_target_version(mock_open, monkeypatch):
     assert command_utils.get_target_version('default') == '9.0'
 
 
-@mock.patch("leapp.cli.commands.command_utils.get_upgrade_paths_config",
-            return_value={"default": {"7.9": ["8.4"], "8.6": ["9.0"], "7": ["8.4"], "8": ["9.0"]}})
-def test_vet_upgrade_path(mock_open, monkeypatch):
+@mock.patch(
+    "leapp.cli.commands.command_utils.get_upgrade_paths_config",
+    return_value={
+        "default": {
+            "7.9": ["8.4"],
+            "8.6": ["9.0", "9.2"],
+            "7": ["8.4"],
+            "8": ["9.0", "9.2"],
+        }
+    },
+)
+def test_get_target_release(mock_open, monkeypatch):  # do not remove mock_open
     monkeypatch.setattr(command_utils, 'get_os_release_version_id', lambda x: '8.6')
 
     # make sure env var LEAPP_DEVEL_TARGET_RELEASE takes precedence
-    # when env var set to a bad version - abort the upgrade
-    args = mock.Mock(target='9.0')
-    monkeypatch.setenv('LEAPP_DEVEL_TARGET_RELEASE', '1.2badsemver')
-    with pytest.raises(CommandError) as err:
-        command_utils.vet_upgrade_path(args)
-        assert 'Unexpected format of target version' in err
-    # MAJOR.MINOR.PATCH is considered as bad version, only MAJOR.MINOR is accepted
     args = mock.Mock(target='9.0')
+    monkeypatch.setenv('LEAPP_DEVEL_TARGET_RELEASE', '9.2')
+    print(os.getenv('LEAPP_DEVEL_TARGET_RELEASE'))
+    assert command_utils.get_target_release(args) == ('9.2', 'default')
+
+    # when env var set to a bad version, expect an error
     monkeypatch.setenv('LEAPP_DEVEL_TARGET_RELEASE', '9.0.0')
     with pytest.raises(CommandError) as err:
-        command_utils.vet_upgrade_path(args)
+        command_utils.get_target_release(args)
         assert 'Unexpected format of target version' in err
+
     # when env var set to a version not in upgrade_paths map - go on and use it
+    # this is checked by an actor in the IPU
     monkeypatch.setenv('LEAPP_DEVEL_TARGET_RELEASE', '1.2')
-    assert command_utils.vet_upgrade_path(args) == ('1.2', 'default')
-    # no env var set, --target is set to proper version
+    assert command_utils.get_target_release(args) == ('1.2', 'default')
+
+    # no env var set, --target is set to proper version - use it
+    args = mock.Mock(target='9.0')
     monkeypatch.delenv('LEAPP_DEVEL_TARGET_RELEASE', raising=False)
-    assert command_utils.vet_upgrade_path(args) == ('9.0', 'default')
-    # env var is set to proper version, --target is set to a bad one - use env var and go on with the upgrade
+    assert command_utils.get_target_release(args) == ('9.0', 'default')
+
+    # --target set with incorrectly formatted version, env var not set, fail
+    args = mock.Mock(target='9.0a')
+    with pytest.raises(CommandError) as err:
+        command_utils.get_target_release(args)
+        assert 'Unexpected format of target version' in err
+
+    # env var is set to proper version, --target set to a bad one:
+    # env var has priority, use it and go on with the upgrade
     monkeypatch.setenv('LEAPP_DEVEL_TARGET_RELEASE', '9.0')
-    args = mock.Mock(target='1.2')
-    assert command_utils.vet_upgrade_path(args) == ('9.0', 'default')
+    args = mock.Mock(target='9.0.0')
+    assert command_utils.get_target_release(args) == ('9.0', 'default')
 
 
 def _mock_getrlimit_factory(nofile_limits=(1024, 4096), fsize_limits=(1024, 4096)):

commands/upgrade/util.py

@@ -253,8 +253,8 @@ def prepare_configuration(args):
     if args.nogpgcheck:
         os.environ['LEAPP_NOGPGCHECK'] = '1'
 
-    # Check upgrade path and fail early if it's unsupported
-    target_version, flavor = command_utils.vet_upgrade_path(args)
+    # Check upgrade path and fail early if it's invalid
+    target_version, flavor = command_utils.get_target_release(args)
     os.environ['LEAPP_UPGRADE_PATH_TARGET_RELEASE'] = target_version
     os.environ['LEAPP_UPGRADE_PATH_FLAVOUR'] = flavor
 

docs/source/contrib-and-devel-guidelines.md

@@ -1,7 +1,7 @@
 # Contribution and development guidelines
 ## Code guidelines
 
-Your code should follow the [Python Coding Guidelines](https://leapp.readthedocs.io/en/latest/python-coding-guidelines.html) used for the leapp project. On top of these rules follow instructions
+Your code should follow the [Python Coding Guidelines](https://leapp.readthedocs.io/en/latest/contributing.html#follow-python-coding-guidelines) used for the leapp project. On top of these rules follow instructions
 below.
 
 ### Retrieving information about the source system should be separated from its use
@@ -51,7 +51,6 @@ can be used.
 Here is the list of repositories in this project with the Python compatibility
 requirements:
 * `system_upgrade/common` - 3.6, 3.9, 3.12 (_you can start to ignore Python 2.7_)
-* _`system_upgrade/el7toel8` - 2.7, 3.6 (deprecated)_
 * `system_upgrade/el8toel9` - 3.6, 3.9
 * `system_upgrade/el9toel10` - 3.9, 3.12
 

docs/source/installation-and-building.md

@@ -11,7 +11,7 @@ To build the RPM e.g. for RHEL 8 systems, execute:
 ```bash
 $ BUILD_CONTAINER=el8 make container_build
 ```
-Possible values for BUILD_CONTAINER are `el7`,`el8`, `el9`.
+Possible values for BUILD_CONTAINER are `el8`, `el9`.
 
 The built packages can be found under the `packaging/RPMS/` directory.