Rebase on upstream most recent version 0.22.0-3 (ffd6d8e456484630f99d98d5bff955914af02aa5)

.github/workflows/codespell.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: codespell-project/actions-codespell@v2
         with:
-          ignore_words_list: ro,fo,couldn,repositor,zeor
+          ignore_words_list: ro,fo,couldn,repositor,zeor,bootup
           skip: "./repos/system_upgrade/common/actors/storagescanner/tests/files/mounts,\
             ./repos/system_upgrade/common/actors/networkmanagerreadconfig/tests/files/nm_cfg_file_error,\
             ./repos/system_upgrade/el8toel9/actors/xorgdrvfact/tests/files/journalctl-xorg-intel,\

.github/workflows/reuse-copr-build.yml

@@ -56,7 +56,7 @@ jobs:
         id: copr_build
         env:
           COPR_CONFIG: "copr_fedora.conf"
-          COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
+          COPR_CHROOT: "epel-8-x86_64"
           COPR_REPO: "@oamg/leapp"
         run: |
           cat << EOF > $COPR_CONFIG
@@ -122,7 +122,7 @@ jobs:
         if: ${{ steps.leapp_pr_regex_match.outputs.match != '' }}
         env:
           COPR_CONFIG: "copr_fedora.conf"
-          COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
+          COPR_CHROOT: "epel-8-x86_64"
           COPR_REPO: "@oamg/leapp"
         run: |
           cat << EOF > $COPR_CONFIG

.github/workflows/tmt-tests.yml

@@ -10,65 +10,6 @@ jobs:
     uses: ./.github/workflows/reuse-copr-build.yml
     secrets: inherit
 
-  call_workflow_tests_79to88_integration:
-    needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
-    secrets: inherit
-    with:
-      copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
-      tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)"
-      pull_request_status_name: "7.9to8.8"
-      variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.8;LEAPPDATA_BRANCH=upstream'
-    if: |
-      github.event.issue.pull_request
-      && ! startsWith(github.event.comment.body, '/rerun-sst')
-      && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
-
-  call_workflow_tests_79to86_integration:
-    needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
-    secrets: inherit
-    with:
-      copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
-      tmt_plan_regex: "^(?!.*max_sst)(.*tier1)"
-      variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.6;LEAPPDATA_BRANCH=upstream'
-      pull_request_status_name: "7.9to8.6"
-    if: |
-      github.event.issue.pull_request
-      && ! startsWith(github.event.comment.body, '/rerun-sst')
-      && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
-
-  call_workflow_tests_79to88_sst:
-    needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
-    secrets: inherit
-    with:
-      copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
-      tmt_plan_regex: "^(?!.*tier[2-3].*)(.*max_sst.*)"
-      pull_request_status_name: "7.9to8.8-sst"
-      update_pull_request_status: 'false'
-      variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.8;LEAPPDATA_BRANCH=upstream'
-    if: |
-      github.event.issue.pull_request
-      && startsWith(github.event.comment.body, '/rerun-sst')
-      && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
-
-  call_workflow_tests_7to8_aws:
-    needs: call_workflow_copr_build
-    uses: oamg/leapp/.github/workflows/reuse-tests-7to8.yml@main
-    secrets: inherit
-    with:
-      copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
-      tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)"
-      compose: "RHEL-7.9-rhui"
-      environment_settings: '{"provisioning": {"post_install_script": "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; echo 42; yum-config-manager --enable rhel-7-server-rhui-optional-rpms"}}'
-      pull_request_status_name: "7to8-aws-e2e"
-      variables: "SOURCE_RELEASE=7.9;TARGET_RELEASE=8.6;RHUI=aws;LEAPPDATA_BRANCH=upstream"
-    if: |
-      github.event.issue.pull_request
-      && ! startsWith(github.event.comment.body, '/rerun-sst')
-      && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association)
-
   call_workflow_tests_86to90_integration:
     needs: call_workflow_copr_build
     uses: oamg/leapp/.github/workflows/reuse-tests-8to9.yml@main

.github/workflows/unit-tests.yml

@@ -49,23 +49,6 @@ jobs:
             python: python3.6
             repos: 'el8toel9,common'
             container: ubi8-lint
-          # 7to8
-          - name: Run unit tests for el7toel8 and common repositories on python 3.6
-            python: python3.6
-            repos: 'el7toel8,common'
-            container: ubi8
-          - name: Run python linters for el7toel8 and common repositories on python 3.6
-            python: python3.6
-            repos: 'el7toel8,common'
-            container: ubi8-lint
-          - name: Run unit tests for el7toel8 and common repositories on python 2.7
-            python: python2.7
-            repos: 'el7toel8,common'
-            container: ubi7
-          - name: Run python linters for el7toel8 and common repositories on python 2.7
-            python: python2.7
-            repos: 'el7toel8,common'
-            container: ubi7-lint
 
     steps:
       - name: Checkout code

.packit.yaml

@@ -32,7 +32,6 @@ jobs:
     owner: "@oamg"
     project: leapp
     targets:
-    - epel-7-x86_64
     - epel-8-x86_64
     - epel-9-x86_64
   actions:
@@ -53,7 +52,6 @@ jobs:
     owner: "@oamg"
     project: leapp
     targets:
-    - epel-7-x86_64
     - epel-8-x86_64
     - epel-9-x86_64
   actions:
@@ -73,7 +71,6 @@ jobs:
     owner: "@oamg"
     project: leapp
     targets:
-    - epel-7-x86_64
     - epel-8-x86_64
     - epel-9-x86_64
   actions:
@@ -95,155 +92,6 @@ jobs:
 # >7tox path https://gitlab.cee.redhat.com/oamg/leapp-tests/-/blob/main/config.yaml
 # Available only to RH Employees.
 
-# ###################################################################### #
-# ############################### 7 TO 8 ############################### #
-# ###################################################################### #
-
-# ###################################################################### #
-# ### Abstract job definitions to make individual tests/jobs smaller ### #
-# ###################################################################### #
-- &sanity-abstract-7to8
-  job: tests
-  trigger: ignore
-  fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"
-  fmf_ref: "rhel7"
-  use_internal_tf: True
-  labels:
-    - sanity
-  targets:
-    epel-7-x86_64:
-      distros: [RHEL-7.9-ZStream]
-  identifier: sanity-abstract-7to8
-  tmt_plan: ""
-
-- &sanity-abstract-7to8-aws
-  <<: *sanity-abstract-7to8
-  labels:
-    - sanity
-    - aws
-  targets:
-    epel-7-x86_64:
-      distros: [RHEL-7.9-rhui]
-  identifier: sanity-abstract-7to8-aws
-
-# On-demand minimal beaker tests
-- &beaker-minimal-7to8-abstract-ondemand
-  <<: *sanity-abstract-7to8
-  manual_trigger: True
-  labels:
-    - beaker-minimal
-  identifier: beaker-minimal-7to8-abstract-ondemand
-
-# On-demand kernel-rt tests
-- &kernel-rt-abstract-7to8-ondemand
-  <<: *beaker-minimal-7to8-abstract-ondemand
-  labels:
-    - kernel-rt
-  identifier: sanity-7to8-kernel-rt-abstract-ondemand
-
-# ###################################################################### #
-# ######################### Individual tests ########################### #
-# ###################################################################### #
-
-# Tests: 7.9 -> 8.10
-- &sanity-79to810
-  <<: *sanity-abstract-7to8
-  trigger: pull_request
-  identifier: sanity-7.9to8.10
-  tf_extra_params:
-    test:
-      tmt:
-        plan_filter: 'tag:7to8 & tag:sanity & enabled:true'
-    environments:
-      - tmt:
-          context:
-            distro: "rhel-7.9"
-            distro_target: "rhel-8.10"
-        settings:
-          provisioning:
-            tags:
-              BusinessUnit: sst_upgrades@leapp_upstream_test
-  env:
-    SOURCE_RELEASE: "7.9"
-    TARGET_RELEASE: "8.10"
-
-- &sanity-79to810-aws
-  <<: *sanity-abstract-7to8-aws
-  trigger: pull_request
-  identifier: sanity-7.9to8.10-aws
-  tf_extra_params:
-    test:
-      tmt:
-        plan_filter: 'tag:7to8 & tag:upgrade_happy_path & enabled:true'
-    environments:
-      - tmt:
-          context:
-            distro: "rhel-7.9"
-            distro_target: "rhel-8.10"
-        settings:
-          provisioning:
-            post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"
-            tags:
-              BusinessUnit: sst_upgrades@leapp_upstream_test
-  env:
-    SOURCE_RELEASE: "7.9"
-    TARGET_RELEASE: "8.10"
-    RHUI: "aws"
-    LEAPPDATA_BRANCH: "upstream"
-    LEAPP_NO_RHSM: "1"
-    USE_CUSTOM_REPOS: rhui
-
-- &beaker-minimal-79to810
-  <<: *beaker-minimal-7to8-abstract-ondemand
-  trigger: pull_request
-  labels:
-    - beaker-minimal
-    - beaker-minimal-7.9to8.10
-    - 7.9to8.10
-  identifier: sanity-7.9to8.10-beaker-minimal-ondemand
-  tf_extra_params:
-    test:
-      tmt:
-        plan_filter: 'tag:7to8 & tag:partitioning & enabled:true'
-    environments:
-      - tmt:
-          context:
-            distro: "rhel-7.9"
-            distro_target: "rhel-8.10"
-        settings:
-          provisioning:
-            tags:
-              BusinessUnit: sst_upgrades@leapp_upstream_test
-  env:
-    SOURCE_RELEASE: "7.9"
-    TARGET_RELEASE: "8.10"
-
-- &kernel-rt-79to810
-  <<: *kernel-rt-abstract-7to8-ondemand
-  trigger: pull_request
-  labels:
-    - kernel-rt
-    - kernel-rt-7.9to8.10
-    - 7.9to8.10
-  identifier: sanity-7.9to8.10-kernel-rt-ondemand
-  tf_extra_params:
-    test:
-      tmt:
-        plan_filter: 'tag:7to8 & tag:kernel-rt & enabled:true'
-    environments:
-      - tmt:
-          context:
-            distro: "rhel-7.9"
-            distro_target: "rhel-8.10"
-        settings:
-          provisioning:
-            tags:
-              BusinessUnit: sst_upgrades@leapp_upstream_test
-  env:
-    SOURCE_RELEASE: "7.9"
-    TARGET_RELEASE: "8.10"
-
-
 # ###################################################################### #
 # ############################## 8 TO 9 ################################ #
 # ###################################################################### #

Makefile

@@ -356,16 +356,17 @@ lint:
 		echo "--- Linting done. ---"; \
 	fi
 
-	if [[  "`git rev-parse --abbrev-ref HEAD`" != "$(MASTER_BRANCH)" ]] && [[ -n "`git diff $(MASTER_BRANCH) --name-only --diff-filter AMR`" ]]; then \
+	if [[  "`git rev-parse --abbrev-ref HEAD`" != "$(MASTER_BRANCH)" ]]; then \
 		. $(VENVNAME)/bin/activate; \
-		git diff $(MASTER_BRANCH) --name-only --diff-filter AMR | grep -v "^docs/" | xargs isort -c --diff || \
-		{ \
+		files_to_sort=`git diff main --name-only --diff-filter AMR | grep -v "^docs/"`; \
+		if [ -n "$$files_to_sort" ]; then \
+			echo "$$files_to_sort" | xargs isort -c --diff || { \
 			echo; \
-			echo "------------------------------------------------------------------------------"; \
-			echo "Hint: Apply the required changes."; \
+			echo "Hint: Apply the required changes.";\
 			echo "      Execute the following command to apply them automatically: make lint_fix"; \
 			exit 1; \
-		} && echo "--- isort check done. ---"; \
+			} && echo "--- isort check done. ---"; \
+		fi \
 	fi
 
 lint_fix: