From d5d998e5cf9d5928a456c8d850aa1b97bfaf74a5 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Mon, 14 Nov 2022 14:02:19 -0300 Subject: [PATCH 01/15] Upgrade packit.yaml config to have integration tests This pull request introduces the execution of leapp integration tests as a packit job instead of the current behavior of using a GitHub Actions to trigger the tests by a comment. Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index e84944ace..70f58cd0a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -43,3 +43,121 @@ jobs: get-current-version: # get version from spec file instead from git tag - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-79to84 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-79to84-sst + tmt_plan: "^(/plans/morf)(?!.*sap)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + TARGET_RELEASE: 8.6 + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-rhui] + identifier: tests-7to8-aws + tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" + tf_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; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + RHUI: "aws" + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-79to86 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + TARGET_RELEASE: 8.6 + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.6-rhui] + identifier: tests-8to9-aws + tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + RHUI: aws + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.6.0-Nightly] + identifier: tests-86to90 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + TARGET_RELEASE: "9.0" + TARGET_KERNEL: el9 + RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.6.0-Nightly] + identifier: tests-86to90-sst + tmt_plan: "^(/plans/morf)(?!.*sap)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + TARGET_RELEASE: "9.0" + TARGET_KERNEL: el9 + RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_ref: "main" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.7.0-Nightly] + identifier: tests-87to91 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + env: + LEAPP_DEVEL_TARGET_PRODUCT_TYPE: beta + RHSM_SKU: RH00069 + TARGET_RELEASE: "9.1" + TARGET_KERNEL: el9 + RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms From 5ecd09d72ed94f1f5dbea55f3a02cfa7d73e31d1 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Wed, 16 Nov 2022 09:38:40 -0300 Subject: [PATCH 02/15] Change from main to master Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 70f58cd0a..6da3db70b 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -46,7 +46,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -58,7 +58,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -72,7 +72,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -86,7 +86,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -100,7 +100,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -114,7 +114,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -130,7 +130,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: @@ -146,7 +146,7 @@ jobs: - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" - fmf_ref: "main" + fmf_ref: "master" use_internal_tf: True trigger: pull_request targets: From c87c39baae7181981061fe79441dfefb3fa52862 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Wed, 16 Nov 2022 11:13:58 -0300 Subject: [PATCH 03/15] Use new URL for leapp-tests Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 6da3db70b..7be3901d0 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -45,7 +45,7 @@ jobs: - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -57,7 +57,7 @@ jobs: tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -71,7 +71,7 @@ jobs: TARGET_RELEASE: 8.6 - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -85,7 +85,7 @@ jobs: RHUI: "aws" - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -99,7 +99,7 @@ jobs: TARGET_RELEASE: 8.6 - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -113,7 +113,7 @@ jobs: RHUI: aws - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -129,7 +129,7 @@ jobs: RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request @@ -145,7 +145,7 @@ jobs: RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/tmt-plans" + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" use_internal_tf: True trigger: pull_request From 1c6719e4442dcc4a19b7a2e75d0e2e637ce1c109 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 18 Nov 2022 09:38:15 -0300 Subject: [PATCH 04/15] Update post-install-script Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 7be3901d0..48065b8af 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -54,7 +54,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to84 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" @@ -66,7 +66,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to84-sst tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" env: TARGET_RELEASE: 8.6 @@ -80,7 +80,7 @@ jobs: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_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; yum install -y leapp-repository*master*" env: RHUI: "aws" @@ -94,7 +94,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to86 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys;curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" env: TARGET_RELEASE: 8.6 @@ -108,7 +108,7 @@ jobs: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" env: RHUI: aws @@ -122,7 +122,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-86to90 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" env: TARGET_RELEASE: "9.0" TARGET_KERNEL: el9 @@ -138,7 +138,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-86to90-sst tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" env: TARGET_RELEASE: "9.0" TARGET_KERNEL: el9 @@ -154,7 +154,7 @@ jobs: distros: [RHEL-8.7.0-Nightly] identifier: tests-87to91 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" env: LEAPP_DEVEL_TARGET_PRODUCT_TYPE: beta RHSM_SKU: RH00069 From dda79bda9e14a93e87c55dce1178a84bcbc93365 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 18 Nov 2022 09:55:51 -0300 Subject: [PATCH 05/15] Change from leapp-repository to leapp-upgrade Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 48065b8af..d95ccb042 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -54,7 +54,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to84 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" @@ -66,7 +66,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to84-sst tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' env: TARGET_RELEASE: 8.6 @@ -80,7 +80,7 @@ jobs: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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; yum install -y leapp-repository*master*" + tf_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; yum install -y \"leapp-upgrade*master*\"' env: RHUI: "aws" @@ -94,7 +94,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to86 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' env: TARGET_RELEASE: 8.6 @@ -108,7 +108,7 @@ jobs: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' env: RHUI: aws @@ -122,7 +122,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-86to90 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' env: TARGET_RELEASE: "9.0" TARGET_KERNEL: el9 @@ -138,7 +138,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-86to90-sst tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' env: TARGET_RELEASE: "9.0" TARGET_KERNEL: el9 @@ -154,7 +154,7 @@ jobs: distros: [RHEL-8.7.0-Nightly] identifier: tests-87to91 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y leapp-repository*master*" + tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' env: LEAPP_DEVEL_TARGET_PRODUCT_TYPE: beta RHSM_SKU: RH00069 From 2222c83a654338785fe2a0e2dbf4c4dc17262ac8 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Fri, 18 Nov 2022 11:09:56 -0300 Subject: [PATCH 06/15] Remove leapp-upgrade from post-install-script installation Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index d95ccb042..fd53f6d58 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -24,6 +24,7 @@ jobs: get-current-version: # get version from spec file instead from git tag - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" + - job: copr_build trigger: commit metadata: @@ -44,6 +45,7 @@ jobs: # get version from spec file instead from git tag - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" + - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" fmf_ref: "master" @@ -54,7 +56,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to84 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - job: tests fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" @@ -66,7 +68,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to84-sst tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: TARGET_RELEASE: 8.6 @@ -80,7 +82,7 @@ jobs: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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; yum install -y \"leapp-upgrade*master*\"' + tf_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" env: RHUI: "aws" @@ -94,7 +96,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-79to86 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: TARGET_RELEASE: 8.6 @@ -108,7 +110,7 @@ jobs: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: RHUI: aws @@ -122,7 +124,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-86to90 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: TARGET_RELEASE: "9.0" TARGET_KERNEL: el9 @@ -138,7 +140,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-86to90-sst tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: TARGET_RELEASE: "9.0" TARGET_KERNEL: el9 @@ -154,7 +156,7 @@ jobs: distros: [RHEL-8.7.0-Nightly] identifier: tests-87to91 tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: '#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"' + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: LEAPP_DEVEL_TARGET_PRODUCT_TYPE: beta RHSM_SKU: RH00069 From a90601acb3dc6fc9b2e554a06021079aa5165dbf Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Thu, 8 Dec 2022 14:22:29 -0300 Subject: [PATCH 07/15] Fix RHEL-*rhui tmt regex filter Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index fd53f6d58..ce2d922c1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -81,7 +81,7 @@ jobs: epel-7-x86_64: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws - tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" + tmt_plan: "^(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" tf_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" env: RHUI: "aws" @@ -109,7 +109,7 @@ jobs: epel-8-x86_64: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws - tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" + tmt_plan: "^(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" env: RHUI: aws From d8ce3c6e83ada8b434275196fed396a63f7c6c7c Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 7 Feb 2023 11:10:24 -0300 Subject: [PATCH 08/15] Add custom context for packit config Added new targets and custom context for tests. Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 347 +++++++++++++++++++++++++++++---------------------- 1 file changed, 199 insertions(+), 148 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index ce2d922c1..bbdcab3ea 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -6,160 +6,211 @@ merge_pr_in_ci: false srpm_build_deps: [] jobs: -- job: copr_build - trigger: pull_request - metadata: - owner: "@oamg" - project: leapp - targets: - - epel-7-ppc64le - - epel-7-x86_64 - - epel-8-x86_64 - - fedora-all-aarch64 - - fedora-all-x86_64 - actions: - post-upstream-clone: - # builds from PRs should have lower NVR than those from master branch - - sed -i "s/1%{?dist}/0%{?dist}/g" packaging/leapp.spec - get-current-version: - # get version from spec file instead from git tag - - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" - -- job: copr_build - trigger: commit - metadata: - branch: master - owner: "@oamg" - project: leapp - targets: - - epel-7-ppc64le - - epel-7-x86_64 - - epel-8-x86_64 - - fedora-all-aarch64 - - fedora-all-x86_64 - actions: - post-upstream-clone: - # builds from master branch should have the highest NVR - - sed -i "s/1%{?dist}/100%{?dist}/g" packaging/leapp.spec - get-current-version: - # get version from spec file instead from git tag - - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" + - job: copr_build + trigger: pull_request + metadata: + owner: "@oamg" + project: leapp + targets: + - epel-7-ppc64le + - epel-7-x86_64 + - epel-8-x86_64 + - fedora-all-aarch64 + - fedora-all-x86_64 + actions: + post-upstream-clone: + # builds from PRs should have lower NVR than those from master branch + - sed -i "s/1%{?dist}/0%{?dist}/g" packaging/leapp.spec + get-current-version: + # get version from spec file instead from git tag + - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" + - job: copr_build + trigger: commit + metadata: + branch: master + owner: "@oamg" + project: leapp + targets: + - epel-7-ppc64le + - epel-7-x86_64 + - epel-8-x86_64 + - fedora-all-aarch64 + - fedora-all-x86_64 + actions: + post-upstream-clone: + # builds from master branch should have the highest NVR + - sed -i "s/1%{?dist}/100%{?dist}/g" packaging/leapp.spec + get-current-version: + # get version from spec file instead from git tag + - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-7-x86_64: - distros: [RHEL-7.9-ZStream] - identifier: tests-79to84 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-7.9to8.6 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.6" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-7-x86_64: - distros: [RHEL-7.9-ZStream] - identifier: tests-79to84-sst - tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - env: - TARGET_RELEASE: 8.6 + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-7.9to8.8 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.8" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-7-x86_64: - distros: [RHEL-7.9-rhui] - identifier: tests-7to8-aws - tmt_plan: "^(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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" - env: - RHUI: "aws" + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-7.9to8.8-sst + tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.8" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-7-x86_64: - distros: [RHEL-7.9-ZStream] - identifier: tests-79to86 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - env: - TARGET_RELEASE: 8.6 + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-rhui] + identifier: tests-7to8-aws-e2e + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" + tf_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" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.6" + RHUI: "aws" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.6-rhui] - identifier: tests-8to9-aws - tmt_plan: "^(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - env: - RHUI: aws + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-8.6.0-Nightly] + identifier: tests-8.6to9.0 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.6" + env: + SOURCE_RELEASE: "8.6" + TARGET_RELEASE: "9.0" + TARGET_KERNEL: "el9" + RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.6.0-Nightly] - identifier: tests-86to90 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - env: - TARGET_RELEASE: "9.0" - TARGET_KERNEL: el9 - RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-8.7.0-Nightly] + identifier: tests-8.7to9.0 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.7" + env: + SOURCE_RELEASE: "8.7" + TARGET_RELEASE: "9.0" + TARGET_KERNEL: "el9" + RHSM_REPOS: "rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.6.0-Nightly] - identifier: tests-86to90-sst - tmt_plan: "^(/plans/morf)(?!.*sap)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - env: - TARGET_RELEASE: "9.0" - TARGET_KERNEL: el9 - RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-8.6.0-Nightly] + identifier: tests-8.6to9.0-sst + tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.6" + env: + SOURCE_RELEASE: "8.6" + TARGET_RELEASE: "9.0" + TARGET_KERNEL: "el9" + RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms" -- job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.7.0-Nightly] - identifier: tests-87to91 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - env: - LEAPP_DEVEL_TARGET_PRODUCT_TYPE: beta - RHSM_SKU: RH00069 - TARGET_RELEASE: "9.1" - TARGET_KERNEL: el9 - RHSM_REPOS: rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms + - job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-8.6-rhui] + identifier: tests-8to9-aws-e2e + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.6" + env: + SOURCE_RELEASE: "8.6" + TARGET_RELEASE: "9.0" + TARGET_KERNEL: "el9" + RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms" + RHUI: "aws" From 2e5bde2a6dcb3f5d7637f2b4dcd49ff23f14713a Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 7 Feb 2023 13:11:44 -0300 Subject: [PATCH 09/15] Add default leapp intsall to post_install_script Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index bbdcab3ea..d2a05a0d1 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -55,7 +55,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.6 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -75,7 +75,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.8 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -95,7 +95,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.8-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -115,7 +115,7 @@ jobs: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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" + tf_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; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -136,7 +136,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -158,7 +158,7 @@ jobs: distros: [RHEL-8.7.0-Nightly] identifier: tests-8.7to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -180,7 +180,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: @@ -202,7 +202,7 @@ jobs: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" tf_extra_params: environments: - tmt: From 8882aa128b3d2e6f51b4aad2f1e1f44a6ff75586 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 7 Feb 2023 13:29:45 -0300 Subject: [PATCH 10/15] Update binary name to install Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index d2a05a0d1..b66eb6476 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -55,7 +55,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.6 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -75,7 +75,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.8 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -95,7 +95,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.8-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -115,7 +115,7 @@ jobs: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-7/group_oamg-leapp-epel-7.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_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; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -136,7 +136,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -158,7 +158,7 @@ jobs: distros: [RHEL-8.7.0-Nightly] identifier: tests-8.7to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -180,7 +180,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: @@ -202,7 +202,7 @@ jobs: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; curl https://copr.fedorainfracloud.org/coprs/g/oamg/leapp/repo/epel-8/group_oamg-leapp-epel-8.repo --output /etc/yum.repos.d/copr_build.repo; yum install -y leapp-repository*master*" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" tf_extra_params: environments: - tmt: From 8a309b03710635f3570926aa9a6fc1194b36fe07 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Thu, 9 Feb 2023 09:22:13 -0300 Subject: [PATCH 11/15] Update indentation Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index b66eb6476..c579b1af5 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -59,8 +59,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-7.9" + context: + distro: "rhel-7.9" env: SOURCE_RELEASE: "7.9" TARGET_RELEASE: "8.6" @@ -79,8 +79,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-7.9" + context: + distro: "rhel-7.9" env: SOURCE_RELEASE: "7.9" TARGET_RELEASE: "8.8" @@ -99,8 +99,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-7.9" + context: + distro: "rhel-7.9" env: SOURCE_RELEASE: "7.9" TARGET_RELEASE: "8.8" @@ -119,8 +119,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-7.9" + context: + distro: "rhel-7.9" env: SOURCE_RELEASE: "7.9" TARGET_RELEASE: "8.6" @@ -140,8 +140,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-8.6" + context: + distro: "rhel-8.6" env: SOURCE_RELEASE: "8.6" TARGET_RELEASE: "9.0" @@ -162,8 +162,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-8.7" + context: + distro: "rhel-8.7" env: SOURCE_RELEASE: "8.7" TARGET_RELEASE: "9.0" @@ -184,8 +184,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-8.6" + context: + distro: "rhel-8.6" env: SOURCE_RELEASE: "8.6" TARGET_RELEASE: "9.0" @@ -206,8 +206,8 @@ jobs: tf_extra_params: environments: - tmt: - context: - distro: "rhel-8.6" + context: + distro: "rhel-8.6" env: SOURCE_RELEASE: "8.6" TARGET_RELEASE: "9.0" From 001d56b6c35dfaa7d9400ca6fcfcfebbc2307136 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 14 Mar 2023 12:54:21 -0300 Subject: [PATCH 12/15] Change a few targets from epel-7 to epel-8 Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index c579b1af5..96e7ca02a 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -132,7 +132,7 @@ jobs: use_internal_tf: True trigger: pull_request targets: - epel-7-x86_64: + epel-8-x86_64: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" @@ -154,7 +154,7 @@ jobs: use_internal_tf: True trigger: pull_request targets: - epel-7-x86_64: + epel-8-x86_64: distros: [RHEL-8.7.0-Nightly] identifier: tests-8.7to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" @@ -176,7 +176,7 @@ jobs: use_internal_tf: True trigger: pull_request targets: - epel-7-x86_64: + epel-8-x86_64: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" @@ -198,7 +198,7 @@ jobs: use_internal_tf: True trigger: pull_request targets: - epel-7-x86_64: + epel-8-x86_64: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" From 4cae94c43d03cc695113eac0e4b8860e4d1f670a Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Tue, 21 Mar 2023 11:57:13 -0300 Subject: [PATCH 13/15] Remove leapp-repository installation from post-install-script Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 96e7ca02a..b620d5696 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -55,7 +55,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.6 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: @@ -75,7 +75,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.8 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: @@ -95,7 +95,7 @@ jobs: distros: [RHEL-7.9-ZStream] identifier: tests-7.9to8.8-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: @@ -115,7 +115,7 @@ jobs: distros: [RHEL-7.9-rhui] identifier: tests-7to8-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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; yum install -y \"leapp-upgrade*master*\"" + tf_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" tf_extra_params: environments: - tmt: @@ -136,7 +136,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: @@ -158,7 +158,7 @@ jobs: distros: [RHEL-8.7.0-Nightly] identifier: tests-8.7to9.0 tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: @@ -180,7 +180,7 @@ jobs: distros: [RHEL-8.6.0-Nightly] identifier: tests-8.6to9.0-sst tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: @@ -202,7 +202,7 @@ jobs: distros: [RHEL-8.6-rhui] identifier: tests-8to9-aws-e2e tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys; yum install -y \"leapp-upgrade*master*\"" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" tf_extra_params: environments: - tmt: From e1ef75bf210bb87aa3d32ae2cee31639399ad936 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Wed, 22 Mar 2023 09:40:00 -0300 Subject: [PATCH 14/15] Update config as needed in #819 Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 395 +++++++++++++++++++++++++-------------------------- 1 file changed, 195 insertions(+), 200 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index b620d5696..edc660a36 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -6,211 +6,206 @@ merge_pr_in_ci: false srpm_build_deps: [] jobs: - - job: copr_build - trigger: pull_request - metadata: - owner: "@oamg" - project: leapp - targets: - - epel-7-ppc64le - - epel-7-x86_64 - - epel-8-x86_64 - - fedora-all-aarch64 - - fedora-all-x86_64 - actions: - post-upstream-clone: - # builds from PRs should have lower NVR than those from master branch - - sed -i "s/1%{?dist}/0%{?dist}/g" packaging/leapp.spec - get-current-version: - # get version from spec file instead from git tag - - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" - - - job: copr_build - trigger: commit - metadata: - branch: master - owner: "@oamg" - project: leapp - targets: - - epel-7-ppc64le - - epel-7-x86_64 - - epel-8-x86_64 - - fedora-all-aarch64 - - fedora-all-x86_64 - actions: - post-upstream-clone: - # builds from master branch should have the highest NVR - - sed -i "s/1%{?dist}/100%{?dist}/g" packaging/leapp.spec - get-current-version: - # get version from spec file instead from git tag - - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" - - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request +- job: copr_build + trigger: pull_request + metadata: + owner: "@oamg" + project: leapp targets: - epel-7-x86_64: - distros: [RHEL-7.9-ZStream] - identifier: tests-7.9to8.6 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-7.9" - env: - SOURCE_RELEASE: "7.9" - TARGET_RELEASE: "8.6" - - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request + - epel-7-ppc64le + - epel-7-x86_64 + - epel-8-x86_64 + - fedora-all-aarch64 + - fedora-all-x86_64 + actions: + post-upstream-clone: + # builds from PRs should have lower NVR than those from master branch + - sed -i "s/1%{?dist}/0%{?dist}/g" packaging/leapp.spec + get-current-version: + # get version from spec file instead from git tag + - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" +- job: copr_build + trigger: commit + metadata: + branch: master + owner: "@oamg" + project: leapp targets: - epel-7-x86_64: - distros: [RHEL-7.9-ZStream] - identifier: tests-7.9to8.8 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-7.9" - env: - SOURCE_RELEASE: "7.9" - TARGET_RELEASE: "8.8" + - epel-7-ppc64le + - epel-7-x86_64 + - epel-8-x86_64 + - fedora-all-aarch64 + - fedora-all-x86_64 + actions: + post-upstream-clone: + # builds from master branch should have the highest NVR + - sed -i "s/1%{?dist}/100%{?dist}/g" packaging/leapp.spec + get-current-version: + # get version from spec file instead from git tag + - bash -c "grep -m1 '^Version:' packaging/leapp.spec | grep -om1 '[0-9].[0-9.]**'" - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-7-x86_64: - distros: [RHEL-7.9-ZStream] - identifier: tests-7.9to8.8-sst - tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-7.9" - env: - SOURCE_RELEASE: "7.9" - TARGET_RELEASE: "8.8" +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-7.9to8.6 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.6" - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-7-x86_64: - distros: [RHEL-7.9-rhui] - identifier: tests-7to8-aws-e2e - tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" - tf_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" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-7.9" - env: - SOURCE_RELEASE: "7.9" - TARGET_RELEASE: "8.6" - RHUI: "aws" +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-ZStream] + identifier: tests-7.9to8.8 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.8" - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.6.0-Nightly] - identifier: tests-8.6to9.0 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-8.6" - env: - SOURCE_RELEASE: "8.6" - TARGET_RELEASE: "9.0" - TARGET_KERNEL: "el9" - RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms" +# - job: tests +# fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" +# fmf_ref: "master" +# use_internal_tf: True +# trigger: pull_request +# targets: +# epel-7-x86_64: +# distros: [RHEL-7.9-ZStream] +# identifier: tests-7.9to8.8-sst +# tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" +# tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" +# tf_extra_params: +# environments: +# - tmt: +# context: +# distro: "rhel-7.9" +# env: +# SOURCE_RELEASE: "7.9" +# TARGET_RELEASE: "8.8" - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.7.0-Nightly] - identifier: tests-8.7to9.0 - tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-8.7" - env: - SOURCE_RELEASE: "8.7" - TARGET_RELEASE: "9.0" - TARGET_KERNEL: "el9" - RHSM_REPOS: "rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms" +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-7-x86_64: + distros: [RHEL-7.9-rhui] + identifier: tests-7to8-aws-e2e + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)" + tf_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" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-7.9" + env: + SOURCE_RELEASE: "7.9" + TARGET_RELEASE: "8.6" + RHUI: "aws" - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.6.0-Nightly] - identifier: tests-8.6to9.0-sst - tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-8.6" - env: - SOURCE_RELEASE: "8.6" - TARGET_RELEASE: "9.0" - TARGET_KERNEL: "el9" - RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms" +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.6.0-Nightly] + identifier: tests-8.6to9.0 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.6" + env: + 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" - - job: tests - fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" - fmf_ref: "master" - use_internal_tf: True - trigger: pull_request - targets: - epel-8-x86_64: - distros: [RHEL-8.6-rhui] - identifier: tests-8to9-aws-e2e - tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" - tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" - tf_extra_params: - environments: - - tmt: - context: - distro: "rhel-8.6" - env: - SOURCE_RELEASE: "8.6" - TARGET_RELEASE: "9.0" - TARGET_KERNEL: "el9" - RHSM_REPOS: "rhel-8-for-x86_64-appstream-eus-rpms,rhel-8-for-x86_64-baseos-eus-rpms" - RHUI: "aws" +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.8.0-Nightly] + identifier: tests-8.8to9.2 + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*max_sst)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.8" + env: + SOURCE_RELEASE: "8.8" + TARGET_RELEASE: "9.2" + RHSM_REPOS: "rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms" + +# - job: tests +# fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" +# fmf_ref: "master" +# use_internal_tf: True +# trigger: pull_request +# targets: +# epel-8-x86_64: +# distros: [RHEL-8.6.0-Nightly] +# identifier: tests-8.6to9.0-sst +# tmt_plan: "^(?!.*tier[2-3].*)(.*max_sst.*)" +# tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" +# tf_extra_params: +# environments: +# - tmt: +# context: +# distro: "rhel-8.6" +# env: +# 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" + +- job: tests + fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" + fmf_ref: "master" + use_internal_tf: True + trigger: pull_request + targets: + epel-8-x86_64: + distros: [RHEL-8.6-rhui] + identifier: tests-8to9-aws-e2e + tmt_plan: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)" + tf_post_install_script: "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys" + tf_extra_params: + environments: + - tmt: + context: + distro: "rhel-8.6" + env: + 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" From d0893c0d0903dac6673bc43628d4430d1982eea3 Mon Sep 17 00:00:00 2001 From: Rodolfo Olivieri Date: Thu, 23 Mar 2023 11:56:35 -0300 Subject: [PATCH 15/15] Add new environment variable to 8.8to9.2 Signed-off-by: Rodolfo Olivieri --- .packit.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index edc660a36..2fc93b522 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -84,6 +84,7 @@ jobs: SOURCE_RELEASE: "7.9" TARGET_RELEASE: "8.8" + # - job: tests # fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests" # fmf_ref: "master" @@ -165,7 +166,8 @@ jobs: env: SOURCE_RELEASE: "8.8" TARGET_RELEASE: "9.2" - RHSM_REPOS: "rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms" + RHSM_REPOS: "rhel-8-for-x86_64-appstream-beta-rpms,rhel-8-for-x86_64-baseos-beta-rpms" + LEAPP_DEVEL_TARGET_RELEASE: "9.2" # - job: tests # fmf_url: "https://gitlab.cee.redhat.com/oamg/leapp-tests"