From d6c971e96790fe7ea150bef2cbe38a1d1b845efe Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 12 Sep 2025 11:35:18 +0000 Subject: [PATCH] Import from CS git --- .gitignore | 2 +- .leapp.metadata | 2 +- ...-e2e-tests-to-reflect-current-IPU-pa.patch | 872 ------------------ ...ognize-only-the-.yaml-file-extension.patch | 30 - ...le-case-when-db-directory-is-missing.patch | 30 - ...allow-to-set-falsy-values-as-default.patch | 66 -- ...e-sclorg-testing-farm-as-github-acti.patch | 40 - SOURCES/0006-Remove-7to8-CI-tests.patch | 180 ---- ....packit.yaml-to-fix-failing-rhui-job.patch | 35 - SPECS/leapp.spec | 24 +- 10 files changed, 8 insertions(+), 1273 deletions(-) delete mode 100644 SOURCES/0001-CI-packit-update-e2e-tests-to-reflect-current-IPU-pa.patch delete mode 100644 SOURCES/0002-configs-recognize-only-the-.yaml-file-extension.patch delete mode 100644 SOURCES/0003-Handle-case-when-db-directory-is-missing.patch delete mode 100644 SOURCES/0004-Fix-CLI-allow-to-set-falsy-values-as-default.patch delete mode 100644 SOURCES/0005-chore-deps-update-sclorg-testing-farm-as-github-acti.patch delete mode 100644 SOURCES/0006-Remove-7to8-CI-tests.patch delete mode 100644 SOURCES/0007-Update-.packit.yaml-to-fix-failing-rhui-job.patch diff --git a/.gitignore b/.gitignore index fdc601b..2373404 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/leapp-0.19.0.tar.gz +SOURCES/leapp-0.20.0.tar.gz diff --git a/.leapp.metadata b/.leapp.metadata index e7b1dd2..9ad1625 100644 --- a/.leapp.metadata +++ b/.leapp.metadata @@ -1 +1 @@ -03632cf33458ec52b7fea2b8c7a5da68d953d4eb SOURCES/leapp-0.19.0.tar.gz +a9b310b4ba20d6ce8f3e4e261035f5f0fcf553d7 SOURCES/leapp-0.20.0.tar.gz diff --git a/SOURCES/0001-CI-packit-update-e2e-tests-to-reflect-current-IPU-pa.patch b/SOURCES/0001-CI-packit-update-e2e-tests-to-reflect-current-IPU-pa.patch deleted file mode 100644 index 5907d7b..0000000 --- a/SOURCES/0001-CI-packit-update-e2e-tests-to-reflect-current-IPU-pa.patch +++ /dev/null @@ -1,872 +0,0 @@ -From bc7fce7288ed8f642be561947aa9d7c7f3047097 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michal=20He=C4=8Dko?= -Date: Mon, 3 Mar 2025 12:32:42 +0100 -Subject: [PATCH 1/7] CI:packit: update e2e tests to reflect current IPU paths - -The current source version used in e2e tests is 8.6 and the target version is 9.0, which are unsupported. This patch bumps the source/target versions used in the CI to source=8.10 and target=9.4. There is also a job with target=9.6, which is expected to be failing until 9.6 is released. - -Also rhel 7 & python2 is not supported anymore. Dropping these obsoleted tests. ---- - .github/workflows/tmt-tests.yml | 27 +- - .packit.yaml | 649 ++++---------------------------- - 2 files changed, 94 insertions(+), 582 deletions(-) - -diff --git a/.github/workflows/tmt-tests.yml b/.github/workflows/tmt-tests.yml -index d994f31..d047cb3 100644 ---- a/.github/workflows/tmt-tests.yml -+++ b/.github/workflows/tmt-tests.yml -@@ -69,62 +69,61 @@ jobs: - && ! startsWith(github.event.comment.body, '/rerun-sst') - && contains(fromJson('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) - -- call_workflow_tests_86to90_integration: -+ call_workflow_tests_810to94_integration: - needs: call_workflow_copr_build - uses: ./.github/workflows/reuse-tests-8to9.yml - secrets: inherit - with: - copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} - tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" -- variables: 'SOURCE_RELEASE=8.6;TARGET_RELEASE=9.0;RHSM_REPOS=rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms;LEAPPDATA_BRANCH=upstream' -- pull_request_status_name: "8.6to9.0" -+ variables: 'SOURCE_RELEASE=8.10;TARGET_RELEASE=9.4;RHSM_REPOS=rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms;LEAPPDATA_BRANCH=upstream' -+ pull_request_status_name: "8.10to9.4" - 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_88to92_integration: -+ call_workflow_tests_810to96_integration: - needs: call_workflow_copr_build - uses: ./.github/workflows/reuse-tests-8to9.yml - secrets: inherit - with: - copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} - tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" -- variables: 'SOURCE_RELEASE=8.8;TARGET_RELEASE=9.2;LEAPP_DEVEL_TARGET_RELEASE=9.2;RHSM_REPOS=rhel-8-for-x86_64-appstream-beta-rpms,rhel-8-for-x86_64-baseos-beta-rpms;LEAPPDATA_BRANCH=upstream' -- compose: "RHEL-8.8.0-Nightly" -- pull_request_status_name: "8.8to9.2" -- tmt_context: "distro=rhel-8.8" -+ variables: 'SOURCE_RELEASE=8.10;TARGET_RELEASE=9.6;LEAPP_DEVEL_TARGET_RELEASE=9.6;RHSM_REPOS=rhel-8-for-x86_64-appstream-beta-rpms,rhel-8-for-x86_64-baseos-beta-rpms;LEAPPDATA_BRANCH=upstream' -+ pull_request_status_name: "8.8to9.6" -+ tmt_context: "distro=rhel-8.10" - 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_sst: -+ call_workflow_tests_810to94_sst: - needs: call_workflow_copr_build - uses: ./.github/workflows/reuse-tests-8to9.yml - secrets: inherit - with: - copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} - tmt_plan_regex: "^(?!.*tier[2-3].*)(.*max_sst.*)" -- variables: 'SOURCE_RELEASE=8.6;TARGET_RELEASE=9.0;RHSM_REPOS=rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms;LEAPPDATA_BRANCH=upstream' -- pull_request_status_name: "8.6to9.0-sst" -+ variables: 'SOURCE_RELEASE=8.10;TARGET_RELEASE=9.4;RHSM_REPOS=rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms;LEAPPDATA_BRANCH=upstream' -+ pull_request_status_name: "8.10to9.4-sst" - update_pull_request_status: 'false' - 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_aws: -+ call_workflow_tests_810to94_aws: - needs: call_workflow_copr_build - uses: ./.github/workflows/reuse-tests-8to9.yml - secrets: inherit - with: - copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} - tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" -- compose: "RHEL-8.6-rhui" -+ compose: "RHEL-8.10-rhui" - environment_settings: '{"provisioning": {"post_install_script": "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"}}' - pull_request_status_name: "8to9-aws-e2e" -- variables: 'SOURCE_RELEASE=8.6;TARGET_RELEASE=9.0;RHSM_REPOS=rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms;RHUI=aws;LEAPPDATA_BRANCH=upstream' -+ variables: 'SOURCE_RELEASE=8.10;TARGET_RELEASE=9.4;RHSM_REPOS=rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms;RHUI=aws;LEAPPDATA_BRANCH=upstream' - if: | - github.event.issue.pull_request - && ! startsWith(github.event.comment.body, '/rerun-sst') -diff --git a/.packit.yaml b/.packit.yaml -index 36a6e16..6f41db1 100644 ---- a/.packit.yaml -+++ b/.packit.yaml -@@ -12,7 +12,6 @@ jobs: - owner: "@oamg" - project: leapp - targets: -- - epel-7-x86_64 - - epel-8-x86_64 - - epel-9-x86_64 - - fedora-all-aarch64 -@@ -31,7 +30,6 @@ jobs: - owner: "@oamg" - project: leapp - targets: -- - epel-7-x86_64 - - epel-8-x86_64 - - epel-9-x86_64 - - fedora-all-aarch64 -@@ -51,341 +49,64 @@ jobs: - # >7tox path https://gitlab.cee.redhat.com/oamg/leapp-tests/-/blob/main/config.yaml - # Available only to RH Employees. - -+ - # ###################################################################### # --# ############################### 7 TO 8 ############################### # -+# ############################## 8 TO 9 ################################ # - # ###################################################################### # - - # ###################################################################### # - # ### Abstract job definitions to make individual tests/jobs smaller ### # - # ###################################################################### # --- &sanity-abstract-7to8 -+ -+#NOTE(pstodulk) putting default values in abstract jobs as from 8.10, as this -+# is the last RHEL 8 release and all new future tests will start from this -+# one release. -+ -+# This job is never triggered - we define abstract anchor that are reused in jobs that 'inherit' -+# and have actionable triggers -+- &sanity-abstract-8to9 - job: tests - trigger: ignore - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" -- fmf_ref: "rhel7" -+ fmf_ref: "main" - 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.8 --- &sanity-79to88-aws -- <<: *sanity-abstract-7to8-aws -- trigger: pull_request -- identifier: sanity-7.9to8.8-aws -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:7to8 & tag:upgrade_happy_path & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-7.9" -- distro_target: "rhel-8.8" -- 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.8" -- RHUI: "aws" -- LEAPPDATA_BRANCH: "upstream" -- LEAPP_NO_RHSM: "1" -- USE_CUSTOM_REPOS: rhui -- --- &sanity-79to88 -- <<: *sanity-abstract-7to8 -- trigger: pull_request -- identifier: sanity-7.9to8.8 -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:7to8 & tag:sanity & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-7.9" -- distro_target: "rhel-8.8" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -- SOURCE_RELEASE: "7.9" -- TARGET_RELEASE: "8.8" -- --- &beaker-minimal-79to88 -- <<: *beaker-minimal-7to8-abstract-ondemand -- trigger: pull_request -- labels: -- - beaker-minimal -- - beaker-minimal-7.9to8.8 -- - 7.9to8.8 -- identifier: sanity-7.9to8.8-beaker-minimal-ondemand -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:7to8 & tag:partitioning & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-7.9" -- distro_target: "rhel-8.8" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -- SOURCE_RELEASE: "7.9" -- TARGET_RELEASE: "8.8" -- --- &kernel-rt-79to88 -- <<: *kernel-rt-abstract-7to8-ondemand -- trigger: pull_request -- labels: -- - kernel-rt -- - kernel-rt-7.9to8.8 -- - 7.9to8.8 -- identifier: sanity-7.9to8.8-kernel-rt-ondemand -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:7to8 & tag:kernel-rt & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-7.9" -- distro_target: "rhel-8.8" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -- SOURCE_RELEASE: "7.9" -- TARGET_RELEASE: "8.8" -- --# 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: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - 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: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - 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 -+ epel-8-x86_64: -+ distros: [RHEL-8.10.0-Nightly] -+ identifier: sanity-abstract-8to9 - tf_extra_params: - test: - tmt: -- plan_filter: 'tag:7to8 & tag:partitioning & enabled:true' -+ plan_filter: 'tag:8to9' - environments: -- - artifacts: -+ - artifacts: &artifacts-for-rhel8 - - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -+ id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" - packages: - - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -+ - python3-leapp -+ - leapp-upgrade-el8toel9-deps - order: 40 -- - tmt: -- context: -- distro: "rhel-7.9" -- distro_target: "rhel-8.10" -+ - &tmt-env-settings-810to94 -+ tmt: -+ context: &tmt-context-810to94 -+ distro: "rhel-8.10" -+ distro_target: "rhel-9.4" - 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: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-7-x86_64/" -- packages: -- - leapp-repository -- - python2-leapp -- - leapp-upgrade-el7toel8-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-7.9" -- distro_target: "rhel-8.10" -+ - &tmt-env-settings-810to96 -+ tmt: -+ context: &tmt-context-810to96 -+ distro: "rhel-8.10" -+ distro_target: "rhel-9.6" - settings: - provisioning: - tags: - BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -- SOURCE_RELEASE: "7.9" -- TARGET_RELEASE: "8.10" -- -- --# ###################################################################### # --# ############################## 8 TO 9 ################################ # --# ###################################################################### # -- --# ###################################################################### # --# ### Abstract job definitions to make individual tests/jobs smaller ### # --# ###################################################################### # -- --#NOTE(pstodulk) putting default values in abstract jobs as from 8.10, as this --# is the last RHEL 8 release and all new future tests will start from this --# one release. -- --- &sanity-abstract-8to9 -- job: tests -- trigger: ignore -- fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" -- fmf_ref: "main" -- use_internal_tf: True -- labels: -- - sanity -- targets: -- epel-8-x86_64: -- distros: [RHEL-8.10.0-Nightly] -- identifier: sanity-abstract-8to9 - - - &sanity-abstract-8to9-aws - <<: *sanity-abstract-8to9 -@@ -414,154 +135,9 @@ jobs: - identifier: sanity-8to9-kernel-rt-abstract-ondemand - - # ###################################################################### # --# ######################### Individual tests ########################### # -+# ############################# 8.10 > 9.4 ############################# # - # ###################################################################### # - --# Tests: 8.8 -> 9.2 --- &sanity-88to92 -- <<: *sanity-abstract-8to9 -- trigger: pull_request -- targets: -- epel-8-x86_64: -- distros: [RHEL-8.8.0-Nightly] -- identifier: sanity-8.8to9.2 -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:8to9 & tag:tier0 & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- tmt: -- context: -- distro: "rhel-8.8" -- distro_target: "rhel-9.2" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -- SOURCE_RELEASE: "8.8" -- TARGET_RELEASE: "9.2" -- RHSM_REPOS_EUS: "eus" -- --- &sanity-88to92-aws -- <<: *sanity-abstract-8to9-aws -- trigger: pull_request -- targets: -- epel-8-x86_64: -- distros: [RHEL-8.8-rhui] -- identifier: sanity-8.8to9.2-aws -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:8to9 & tag:rhui-tier[0] & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- tmt: -- context: -- distro: "rhel-8.8" -- distro_target: "rhel-9.2" -- 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: "8.8" -- TARGET_RELEASE: "9.2" -- RHUI_HYPERSCALER: aws -- --- &beaker-minimal-88to92 -- <<: *beaker-minimal-8to9-abstract-ondemand -- trigger: pull_request -- labels: -- - beaker-minimal -- - beaker-minimal-8.8to9.2 -- - 8.8to9.2 -- targets: -- epel-8-x86_64: -- distros: [RHEL-8.8.0-Nightly] -- identifier: sanity-8.8to9.2-beaker-minimal-ondemand -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:8to9 &tag:partitioning & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- tmt: -- context: -- distro: "rhel-8.8" -- distro_target: "rhel-9.2" -- 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: "8.8" -- TARGET_RELEASE: "9.2" -- RHSM_REPOS_EUS: "eus" -- --- &kernel-rt-88to92 -- <<: *kernel-rt-abstract-8to9-ondemand -- trigger: pull_request -- labels: -- - kernel-rt -- - kernel-rt-8.8to9.2 -- - 8.8to9.2 -- identifier: sanity-8.8to9.2-kernel-rt-ondemand -- targets: -- epel-8-x86_64: -- distros: [RHEL-8.8.0-Nightly] -- tf_extra_params: -- test: -- tmt: -- plan_filter: 'tag:8to9 & tag:kernel-rt & enabled:true' -- environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- tmt: -- context: -- distro: "rhel-8.8" -- distro_target: "rhel-9.2" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -- SOURCE_RELEASE: "8.8" -- TARGET_RELEASE: "9.2" -- RHSM_REPOS_EUS: "eus" -- -- --# Tests: 8.10 -> 9.4 - - &sanity-810to94 - <<: *sanity-abstract-8to9 - trigger: pull_request -@@ -571,27 +147,12 @@ jobs: - tmt: - plan_filter: 'tag:8to9 & tag:tier0 & enabled:true' - environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-8.10" -- distro_target: "rhel-9.4" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -+ - artifacts: *artifacts-for-rhel8 -+ - *tmt-env-settings-810to94 -+ env: &env-810to94 - SOURCE_RELEASE: "8.10" - TARGET_RELEASE: "9.4" - --# On-demand minimal beaker tests - - &beaker-minimal-810to94 - <<: *beaker-minimal-8to9-abstract-ondemand - trigger: pull_request -@@ -605,27 +166,11 @@ jobs: - tmt: - plan_filter: 'tag:8to9 & tag:partitioning & enabled:true' - environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-8.10" -- distro_target: "rhel-9.4" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -+ - artifacts: *artifacts-for-rhel8 -+ - *tmt-env-settings-810to94 - env: -- SOURCE_RELEASE: "8.10" -- TARGET_RELEASE: "9.4" -+ <<: *env-810to94 - --# On-demand kernel-rt tests - - &kernel-rt-810to94 - <<: *kernel-rt-abstract-8to9-ondemand - trigger: pull_request -@@ -639,56 +184,54 @@ jobs: - tmt: - plan_filter: 'tag:8to9 & tag:kernel-rt & enabled:true' - environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -+ - artifacts: *artifacts-for-rhel8 -+ - *tmt-env-settings-810to94 -+ env: -+ <<: *env-810to94 -+ -+- &sanity-810to94-aws -+ <<: *sanity-abstract-8to9-aws -+ trigger: pull_request -+ targets: -+ epel-8-x86_64: -+ distros: [RHEL-8.10-rhui] -+ identifier: sanity-8.10to9.4-aws -+ tf_extra_params: -+ test: -+ tmt: -+ plan_filter: 'tag:8to9 & tag:rhui-tier[0] & enabled:true' -+ environments: -+ - artifacts: *artifacts-for-rhel8 - - tmt: -- context: -- distro: "rhel-8.10" -- distro_target: "rhel-9.4" -+ context: *tmt-context-810to94 - 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: "8.10" -- TARGET_RELEASE: "9.4" -+ <<: *env-810to94 -+ RHUI_HYPERSCALER: aws - - --# Tests: 8.10 -> 9.5 --- &sanity-810to95 -+# ###################################################################### # -+# ############################# 8.10 > 9.6 ############################# # -+# ###################################################################### # -+ -+- &sanity-810to96 - <<: *sanity-abstract-8to9 - trigger: pull_request -- identifier: sanity-8.10to9.5 -+ identifier: sanity-8.10to9.6 - tf_extra_params: - test: - tmt: - plan_filter: 'tag:8to9 & tag:tier0 & enabled:true' - environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-8.10" -- distro_target: "rhel-9.5" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -- env: -+ - artifacts: *artifacts-for-rhel8 -+ - *tmt-env-settings-810to96 -+ env: &env-810to96 - SOURCE_RELEASE: "8.10" -- TARGET_RELEASE: "9.5" -+ TARGET_RELEASE: "9.6" - - # On-demand minimal beaker tests - - &beaker-minimal-810to95 -@@ -696,64 +239,34 @@ jobs: - trigger: pull_request - labels: - - beaker-minimal -- - beaker-minimal-8.10to9.5 -- - 8.10to9.5 -- identifier: sanity-8.10to9.5-beaker-minimal-ondemand -+ - beaker-minimal-8.10to9.6 -+ - 8.10to9.6 -+ identifier: sanity-8.10to9.6-beaker-minimal-ondemand - tf_extra_params: - test: - tmt: - plan_filter: 'tag:8to9 & tag:partitioning & enabled:true' - environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-8.10" -- distro_target: "rhel-9.5" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -+ - artifacts: *artifacts-for-rhel8 -+ - *tmt-env-settings-810to96 - env: -- SOURCE_RELEASE: "8.10" -- TARGET_RELEASE: "9.5" -+ <<: *env-810to96 - - # On-demand kernel-rt tests --- &kernel-rt-810to95 -+- &kernel-rt-810to96 - <<: *kernel-rt-abstract-8to9-ondemand - trigger: pull_request - labels: - - kernel-rt -- - kernel-rt-8.10to9.5 -- - 8.10to9.5 -- identifier: sanity-8.10to9.5-kernel-rt-ondemand -+ - kernel-rt-8.10to9.6 -+ - 8.10to9.6 -+ identifier: sanity-8.10to9.6-kernel-rt-ondemand - tf_extra_params: - test: - tmt: - plan_filter: 'tag:8to9 & tag:kernel-rt & enabled:true' - environments: -- - artifacts: -- - type: "repository" -- id: "https://download.copr.fedorainfracloud.org/results/@oamg/leapp/epel-8-x86_64/" -- packages: -- - leapp-repository -- - python3-leapp -- - leapp-upgrade-el8toel9-deps -- order: 40 -- - tmt: -- context: -- distro: "rhel-8.10" -- distro_target: "rhel-9.5" -- settings: -- provisioning: -- tags: -- BusinessUnit: sst_upgrades@leapp_upstream_test -+ - artifacts: *artifacts-for-rhel8 -+ - *tmt-env-settings-810to96 - env: -- SOURCE_RELEASE: "8.10" -- TARGET_RELEASE: "9.5" -+ <<: *env-810to96 --- -2.49.0 - diff --git a/SOURCES/0002-configs-recognize-only-the-.yaml-file-extension.patch b/SOURCES/0002-configs-recognize-only-the-.yaml-file-extension.patch deleted file mode 100644 index b3d7713..0000000 --- a/SOURCES/0002-configs-recognize-only-the-.yaml-file-extension.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4ddbae04c8d012ef48e9cef198050e96fad8c402 Mon Sep 17 00:00:00 2001 -From: MichalHe -Date: Tue, 18 Mar 2025 10:33:11 +0100 -Subject: [PATCH 2/7] configs: recognize only the .yaml file extension - -Leapp recognized two file extensions for its configuration files: -.yaml and .yml. This patch removes the recognition of .yml to -avoid user confusion, e.g., creating configuration files with -the same name but different extensions. This patch also enforces -our documentation to use only one extension. ---- - leapp/actors/config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/leapp/actors/config.py b/leapp/actors/config.py -index 160c159..55775d5 100644 ---- a/leapp/actors/config.py -+++ b/leapp/actors/config.py -@@ -146,7 +146,7 @@ def _get_config(config_dir='/etc/leapp/actor_conf.d'): - # We do not do a recursive walk to maintain Python2 compatibility, but we do - # not expect rich config hierarchies, so no harm done. - config_files = glob.glob(os.path.join(config_dir, '*')) -- config_files = [f for f in config_files if f.endswith('.yml') or f.endswith('.yaml')] -+ config_files = [f for f in config_files if f.endswith('.yaml')] - config_files.sort() - - configuration = {} --- -2.49.0 - diff --git a/SOURCES/0003-Handle-case-when-db-directory-is-missing.patch b/SOURCES/0003-Handle-case-when-db-directory-is-missing.patch deleted file mode 100644 index 6488735..0000000 --- a/SOURCES/0003-Handle-case-when-db-directory-is-missing.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4c805dd449c39c1ff00cea4563cc8227ff23a5ec Mon Sep 17 00:00:00 2001 -From: karolinku -Date: Tue, 1 Apr 2025 16:01:08 +0200 -Subject: [PATCH 3/7] Handle case when db directory is missing - -When directory is missing, this change will introduce creation of -missing path and allow proceeding with execution. - -JIRA: RHEL-54382 ---- - leapp/utils/audit/__init__.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/leapp/utils/audit/__init__.py b/leapp/utils/audit/__init__.py -index 8511179..d5ebb73 100644 ---- a/leapp/utils/audit/__init__.py -+++ b/leapp/utils/audit/__init__.py -@@ -57,6 +57,9 @@ def create_connection(path): - :param path: Path to the database - :return: Connection object - """ -+ db_dir_path = os.path.dirname(path) -+ if not os.path.exists(db_dir_path): -+ os.mkdir(db_dir_path, mode=0o700) - with _umask(0o177): - return _initialize_database(sqlite3.connect(path)) - --- -2.49.0 - diff --git a/SOURCES/0004-Fix-CLI-allow-to-set-falsy-values-as-default.patch b/SOURCES/0004-Fix-CLI-allow-to-set-falsy-values-as-default.patch deleted file mode 100644 index fa8fbed..0000000 --- a/SOURCES/0004-Fix-CLI-allow-to-set-falsy-values-as-default.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 372ac6894d206eb9adab704dd12a901d824f4b39 Mon Sep 17 00:00:00 2001 -From: Petr Stodulka -Date: Sun, 6 Apr 2025 20:06:03 +0200 -Subject: [PATCH 4/7] Fix CLI: allow to set falsy values as default - -When specifying an option for a leapp CLI command using @add_option -decorator, it has not been possible to specify a "falsy" value -(or let's say empty) as `default` e.g. empty string, empty list, etc. -Start to check NoneType for the `default` parameter properly to -allow it to set this. - -Bump leapp-framework to 6.1. - -Note: -The similar problem is for `choices` and `metavar` parameters. -In case of `metavar` it's however ok to ignore empty string. -In case of empty `choices` it would lead to the same evaluation as -in case of NoneType (any input is ok). So I that the `default` is the -only parameter that needs to be checked properly. - -JIRA: RHEL-86206 ---- - leapp/utils/clicmd.py | 6 +++--- - packaging/leapp.spec | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/leapp/utils/clicmd.py b/leapp/utils/clicmd.py -index eef6834..89d3e27 100644 ---- a/leapp/utils/clicmd.py -+++ b/leapp/utils/clicmd.py -@@ -228,8 +228,8 @@ class Command(object): - :type metavar: str - :param choices: range of values that the argument is allowed to take - :type choices: list -- :param choices: default value of the argument if nothing is specified -- :type choices: str -+ :param default: default value of the argument if nothing is specified -+ :type default: any - :return: self - """ - name = name.lstrip('-') -@@ -250,7 +250,7 @@ class Command(object): - kwargs['metavar'] = metavar - if choices: - kwargs['choices'] = choices -- if default: -+ if default is not None: - kwargs['default'] = default - self._add_opt(*names, help=help, # noqa; pylint: disable=redefined-builtin - action=action, internal={'wrapped': wrapped, 'inherit': inherit}, **kwargs) -diff --git a/packaging/leapp.spec b/packaging/leapp.spec -index b942112..19d49e1 100644 ---- a/packaging/leapp.spec -+++ b/packaging/leapp.spec -@@ -13,7 +13,7 @@ - # This is kind of help for more flexible development of leapp repository, - # so people do not have to wait for new official release of leapp to ensure - # it is installed/used the compatible one. --%global framework_version 6.0 -+%global framework_version 6.1 - - # IMPORTANT: everytime the requirements are changed, increment number by one - # - same for Provides in deps subpackage --- -2.49.0 - diff --git a/SOURCES/0005-chore-deps-update-sclorg-testing-farm-as-github-acti.patch b/SOURCES/0005-chore-deps-update-sclorg-testing-farm-as-github-acti.patch deleted file mode 100644 index d4cba33..0000000 --- a/SOURCES/0005-chore-deps-update-sclorg-testing-farm-as-github-acti.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 53f22282347011801fa709ba6b558f87fec26bc1 Mon Sep 17 00:00:00 2001 -From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> -Date: Mon, 7 Apr 2025 13:01:51 +0000 -Subject: [PATCH 5/7] chore(deps): update sclorg/testing-farm-as-github-action - action to v4 - ---- - .github/workflows/reuse-tests-7to8.yml | 2 +- - .github/workflows/reuse-tests-8to9.yml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.github/workflows/reuse-tests-7to8.yml b/.github/workflows/reuse-tests-7to8.yml -index 65621b5..7f7ce35 100644 ---- a/.github/workflows/reuse-tests-7to8.yml -+++ b/.github/workflows/reuse-tests-7to8.yml -@@ -46,7 +46,7 @@ jobs: - steps: - - name: Schedule regression testing for 7to8 - id: run_test_7to8 -- uses: sclorg/testing-farm-as-github-action@v3.1.2 -+ uses: sclorg/testing-farm-as-github-action@v4.0.0 - with: - # required - api_url: ${{ secrets.TF_ENDPOINT }} -diff --git a/.github/workflows/reuse-tests-8to9.yml b/.github/workflows/reuse-tests-8to9.yml -index 12e69c7..811fd8e 100644 ---- a/.github/workflows/reuse-tests-8to9.yml -+++ b/.github/workflows/reuse-tests-8to9.yml -@@ -47,7 +47,7 @@ jobs: - steps: - - name: Schedule regression testing for 8to9 - id: run_test_8to9 -- uses: sclorg/testing-farm-as-github-action@v3.1.2 -+ uses: sclorg/testing-farm-as-github-action@v4.0.0 - with: - # required - api_url: ${{ secrets.TF_ENDPOINT }} --- -2.49.0 - diff --git a/SOURCES/0006-Remove-7to8-CI-tests.patch b/SOURCES/0006-Remove-7to8-CI-tests.patch deleted file mode 100644 index 6f5b5c3..0000000 --- a/SOURCES/0006-Remove-7to8-CI-tests.patch +++ /dev/null @@ -1,180 +0,0 @@ -From cfdce5f3fc6fce6d9e253c153ec94aad9ceb0609 Mon Sep 17 00:00:00 2001 -From: Tomas Fratrik -Date: Wed, 23 Apr 2025 13:11:32 +0200 -Subject: [PATCH 6/7] Remove 7to8 CI tests - -Removing 7to8 CI tests because the upgrade path from RHEL-7 to RHEL-8 is no longer supported. - -Jira: RHELMISC-11004 ---- - .github/workflows/reuse-tests-7to8.yml | 69 -------------------------- - .github/workflows/tmt-tests.yml | 59 ---------------------- - .github/workflows/unit-tests.yml | 6 --- - 3 files changed, 134 deletions(-) - delete mode 100644 .github/workflows/reuse-tests-7to8.yml - -diff --git a/.github/workflows/reuse-tests-7to8.yml b/.github/workflows/reuse-tests-7to8.yml -deleted file mode 100644 -index 7f7ce35..0000000 ---- a/.github/workflows/reuse-tests-7to8.yml -+++ /dev/null -@@ -1,69 +0,0 @@ --name: reuse-tests-7to8@TF -- --on: -- workflow_call: -- secrets: -- TF_ENDPOINT: -- required: True -- TF_API_KEY: -- required: True -- inputs: -- copr_artifacts: -- required: True -- type: string -- tmt_plan_regex: -- type: string -- default: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)" -- environment_settings: -- type: string -- default: '{"provisioning": {"post_install_script": "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"}}' -- arch: -- type: string -- default: 'x86_64' -- pull_request_status_name: -- type: string -- default: '7to8' -- copr: -- type: string -- default: 'epel-7-x86_64' -- tmt_context: -- type: string -- default: 'distro=rhel-7.9' -- compose: -- type: string -- default: 'RHEL-7.9-ZStream' -- variables: -- type: string -- default: '' -- update_pull_request_status: -- type: string -- default: 'true' -- --jobs: -- reusable_workflow_job: -- name: Schedule regression tests on Testing Farm -- runs-on: ubuntu-24.04 -- steps: -- - name: Schedule regression testing for 7to8 -- id: run_test_7to8 -- uses: sclorg/testing-farm-as-github-action@v4.0.0 -- with: -- # required -- api_url: ${{ secrets.TF_ENDPOINT }} -- api_key: ${{ secrets.TF_API_KEY }} -- git_url: 'https://gitlab.cee.redhat.com/oamg/tmt-plans' -- github_token: ${{ secrets.GITHUB_TOKEN }} -- # optional -- tf_scope: 'private' -- create_issue_comment: 'true' -- update_pull_request_status: ${{ inputs.update_pull_request_status }} -- tmt_plan_regex: ${{ inputs.tmt_plan_regex }} -- compose: ${{ inputs.compose }} -- arch: ${{ inputs.arch }} -- copr: ${{ inputs.copr }} -- copr_artifacts: ${{ inputs.copr_artifacts }} -- debug: ${{ secrets.ACTIONS_STEP_DEBUG }} -- tmt_context: ${{ inputs.tmt_context }} -- pull_request_status_name: ${{ inputs.pull_request_status_name }} -- environment_settings: ${{ inputs.environment_settings }} -- variables: ${{ inputs.variables }} -diff --git a/.github/workflows/tmt-tests.yml b/.github/workflows/tmt-tests.yml -index d047cb3..d4671c4 100644 ---- a/.github/workflows/tmt-tests.yml -+++ b/.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: ./.github/workflows/reuse-tests-7to8.yml -- 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: ./.github/workflows/reuse-tests-7to8.yml -- 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)" -- 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: ./.github/workflows/reuse-tests-7to8.yml -- 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: ./.github/workflows/reuse-tests-7to8.yml -- 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_810to94_integration: - needs: call_workflow_copr_build - uses: ./.github/workflows/reuse-tests-8to9.yml -diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml -index d994b27..2702e93 100644 ---- a/.github/workflows/unit-tests.yml -+++ b/.github/workflows/unit-tests.yml -@@ -33,12 +33,6 @@ jobs: - - name: Run python linters with python 3.6 on el8 - python: python3.6 - container: ubi8-lint -- - name: Run unit tests with python2.7 on el7 -- python: python2.7 -- container: ubi7 -- - name: Run python linters with python2.7 on el7 -- python: python2.7 -- container: ubi7-lint - - steps: - - name: Checkout code --- -2.49.0 - diff --git a/SOURCES/0007-Update-.packit.yaml-to-fix-failing-rhui-job.patch b/SOURCES/0007-Update-.packit.yaml-to-fix-failing-rhui-job.patch deleted file mode 100644 index 7ab0fa6..0000000 --- a/SOURCES/0007-Update-.packit.yaml-to-fix-failing-rhui-job.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3981f12bd9c8d71539f2ccd8b1877d203a292efd Mon Sep 17 00:00:00 2001 -From: Michal Macura -Date: Tue, 6 May 2025 17:26:30 +0200 -Subject: [PATCH 7/7] Update .packit.yaml to fix failing rhui job - -This commit updates the tag and env for the sanity-810to94-aws job to -make it run correctly. ---- - .packit.yaml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/.packit.yaml b/.packit.yaml -index 6f41db1..67e0b28 100644 ---- a/.packit.yaml -+++ b/.packit.yaml -@@ -199,7 +199,7 @@ jobs: - tf_extra_params: - test: - tmt: -- plan_filter: 'tag:8to9 & tag:rhui-tier[0] & enabled:true' -+ plan_filter: 'tag:8to9 & tag:rhui-aws-tier0 & enabled:true' - environments: - - artifacts: *artifacts-for-rhel8 - - tmt: -@@ -211,7 +211,6 @@ jobs: - BusinessUnit: sst_upgrades@leapp_upstream_test - env: - <<: *env-810to94 -- RHUI_HYPERSCALER: aws - - - # ###################################################################### # --- -2.49.0 - diff --git a/SPECS/leapp.spec b/SPECS/leapp.spec index 8bea8a6..850b83d 100644 --- a/SPECS/leapp.spec +++ b/SPECS/leapp.spec @@ -36,8 +36,8 @@ %endif Name: leapp -Version: 0.19.0 -Release: 3%{?dist} +Version: 0.20.0 +Release: 1%{?dist} Summary: OS & Application modernization framework License: ASL 2.0 @@ -66,14 +66,6 @@ Requires: leapp-repository # PATCHES HERE # Patch0001: filename.patch -Patch0001: 0001-CI-packit-update-e2e-tests-to-reflect-current-IPU-pa.patch -Patch0002: 0002-configs-recognize-only-the-.yaml-file-extension.patch -Patch0003: 0003-Handle-case-when-db-directory-is-missing.patch -Patch0004: 0004-Fix-CLI-allow-to-set-falsy-values-as-default.patch -Patch0005: 0005-chore-deps-update-sclorg-testing-farm-as-github-acti.patch -Patch0006: 0006-Remove-7to8-CI-tests.patch -Patch0007: 0007-Update-.packit.yaml-to-fix-failing-rhui-job.patch - %description Leapp utility provides the possibility to use the Leapp framework via CLI. The utility itself does not define any subcommands but "help". All leapp @@ -170,14 +162,6 @@ Requires: findutils # APPLY REGISTERED PATCHES HERE # %%patch -P 0001 -p1 -%patch -P 0001 -p1 -%patch -P 0002 -p1 -%patch -P 0003 -p1 -%patch -P 0004 -p1 -%patch -P 0005 -p1 -%patch -P 0006 -p1 -%patch -P 0007 -p1 - ################################################## # Build @@ -262,6 +246,10 @@ install -m 0644 -p man/leapp.1 %{buildroot}%{_mandir}/man1/ # no files here %changelog +* Thu Aug 14 2025 Karolina Kula - 0.20.0-1 +- Rebase to new upstream 0.20.0 +- Resolves: RHEL-67625 + * Wed May 14 2025 Petr Stodulka - 0.19.0-3 - Rebuild