From 821358f50454108b3b43c1e51623089424a8cc7b Mon Sep 17 00:00:00 2001 From: Inessa Vasilevskaya Date: Fri, 16 Dec 2022 11:38:53 +0100 Subject: [PATCH 12/16] Set SOURCE_RELEASE env var Following a change in tmt-tests this is a necessary addition for upgrade_plugin to correctly choose an upgrade path. --- .github/workflows/tmt-tests.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tmt-tests.yml b/.github/workflows/tmt-tests.yml index 2212453..1fd012b 100644 --- a/.github/workflows/tmt-tests.yml +++ b/.github/workflows/tmt-tests.yml @@ -18,7 +18,7 @@ jobs: copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" pull_request_status_name: "7.9to8.8" - variables: 'TARGET_RELEASE=8.8' + variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.8' if: | github.event.issue.pull_request && ! startsWith(github.event.comment.body, '/rerun-sst') @@ -30,8 +30,8 @@ jobs: secrets: inherit with: copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} - tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - variables: 'TARGET_RELEASE=8.6' + tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)" + variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.6' pull_request_status_name: "7.9to8.6" if: | github.event.issue.pull_request @@ -47,7 +47,7 @@ jobs: tmt_plan_regex: "^(/plans/morf)(?!.*sap)" pull_request_status_name: "7.9to8.8-sst" update_pull_request_status: 'false' - variables: 'TARGET_RELEASE=8.8' + variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.8' if: | github.event.issue.pull_request && startsWith(github.event.comment.body, '/rerun-sst') @@ -63,7 +63,7 @@ jobs: 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: "RHUI=aws" + variables: 'SOURCE_RELEASE=7.9;TARGET_RELEASE=8.6;RHUI=aws' if: | github.event.issue.pull_request && ! startsWith(github.event.comment.body, '/rerun-sst') @@ -76,7 +76,7 @@ jobs: with: copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - variables: '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' + variables: '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' pull_request_status_name: "8.6to9.0" if: | github.event.issue.pull_request @@ -90,7 +90,7 @@ jobs: with: copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*tier[2-3].*)(?!.*rhsm)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)" - variables: 'TARGET_RELEASE=9.0;TARGET_KERNEL=el9;RHSM_REPOS=rhel-8-for-x86_64-appstream-rpms,rhel-8-for-x86_64-baseos-rpms' + variables: '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' compose: 'RHEL-8.7.0-Nightly' pull_request_status_name: "8.7to9.0" tmt_context: "distro=rhel-8.7" @@ -106,7 +106,7 @@ jobs: with: copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }} tmt_plan_regex: "^(/plans/morf)(?!.*sap)" - variables: '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' + variables: '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' pull_request_status_name: "8.6to9.0-sst" update_pull_request_status: 'false' if: | @@ -124,7 +124,7 @@ jobs: compose: "RHEL-8.6-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: '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' + variables: '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' if: | github.event.issue.pull_request && ! startsWith(github.event.comment.body, '/rerun-sst') -- 2.39.0