120 lines
5.3 KiB
Diff
120 lines
5.3 KiB
Diff
From 98a6bcebba640c7645c02465dde4895227cce825 Mon Sep 17 00:00:00 2001
|
|
From: Inessa Vasilevskaya <ivasilev@redhat.com>
|
|
Date: Thu, 10 Nov 2022 13:19:40 +0100
|
|
Subject: [PATCH 09/16] Tune tmt tests regexes to align with QE automation
|
|
|
|
In order for upstream tests and those launched with QE tooling
|
|
to produce the comparable set of results it's a wise thing to
|
|
do.
|
|
---
|
|
.github/workflows/reuse-tests-7to8.yml | 2 +-
|
|
.github/workflows/reuse-tests-8to9.yml | 2 +-
|
|
.github/workflows/tmt-tests.yml | 16 ++++++++--------
|
|
3 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/.github/workflows/reuse-tests-7to8.yml b/.github/workflows/reuse-tests-7to8.yml
|
|
index 9d8e0db..b1a9a8e 100644
|
|
--- a/.github/workflows/reuse-tests-7to8.yml
|
|
+++ b/.github/workflows/reuse-tests-7to8.yml
|
|
@@ -13,7 +13,7 @@ on:
|
|
type: string
|
|
tmt_plan_regex:
|
|
type: string
|
|
- default: "^(?!.*c2r)(?!.*sap)(?!.*8to9)"
|
|
+ default: "^(?!.*upgrade_plugin)(?!.*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"}}'
|
|
diff --git a/.github/workflows/reuse-tests-8to9.yml b/.github/workflows/reuse-tests-8to9.yml
|
|
index a7adace..828a717 100644
|
|
--- a/.github/workflows/reuse-tests-8to9.yml
|
|
+++ b/.github/workflows/reuse-tests-8to9.yml
|
|
@@ -13,7 +13,7 @@ on:
|
|
type: string
|
|
tmt_plan_regex:
|
|
type: string
|
|
- default: "^(?!.*c2r)(?!.*sap)(?!.*7to8)"
|
|
+ default: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)"
|
|
environment_settings:
|
|
type: string
|
|
default: '{"provisioning": {"post_install_script": "#!/bin/sh\nsudo sed -i s/.*ssh-rsa/ssh-rsa/ /root/.ssh/authorized_keys"}}'
|
|
diff --git a/.github/workflows/tmt-tests.yml b/.github/workflows/tmt-tests.yml
|
|
index cfad280..6b9a0b4 100644
|
|
--- a/.github/workflows/tmt-tests.yml
|
|
+++ b/.github/workflows/tmt-tests.yml
|
|
@@ -16,7 +16,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)"
|
|
+ tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)"
|
|
pull_request_status_name: "7.9to8.4"
|
|
|
|
call_workflow_tests_79to86_integration:
|
|
@@ -25,7 +25,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)"
|
|
+ tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*8to9)(?!.*morf)"
|
|
variables: 'TARGET_RELEASE=8.6'
|
|
pull_request_status_name: "7.9to8.6"
|
|
|
|
@@ -35,7 +35,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*8to9)(.*morf)"
|
|
+ tmt_plan_regex: "^(/plans/morf)(?!.*sap)"
|
|
pull_request_status_name: "7.9to8.4-sst"
|
|
update_pull_request_status: 'false'
|
|
if: |
|
|
@@ -49,7 +49,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*8to9)(.*e2e)"
|
|
+ tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*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"
|
|
@@ -61,7 +61,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)"
|
|
+ tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)"
|
|
pull_request_status_name: "8.6to9.0"
|
|
|
|
call_workflow_tests_87to91_integration:
|
|
@@ -70,7 +70,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)"
|
|
+ tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(?!.*morf)"
|
|
variables: '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'
|
|
compose: 'RHEL-8.7.0-Nightly'
|
|
pull_request_status_name: "8.7to9.1"
|
|
@@ -82,7 +82,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*7to8)(.*morf)"
|
|
+ tmt_plan_regex: "^(/plans/morf)(?!.*sap)"
|
|
pull_request_status_name: "8.6to9.0-sst"
|
|
update_pull_request_status: 'false'
|
|
if: |
|
|
@@ -96,7 +96,7 @@ jobs:
|
|
secrets: inherit
|
|
with:
|
|
copr_artifacts: ${{ needs.call_workflow_copr_build.outputs.artifacts }}
|
|
- tmt_plan_regex: "^(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)"
|
|
+ tmt_plan_regex: "^(?!.*upgrade_plugin)(?!.*c2r)(?!.*sap)(?!.*7to8)(.*e2e)"
|
|
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"
|
|
--
|
|
2.39.0
|
|
|