From a051cdee2c11421ffccad95bbec3dad3ce9b50fb Mon Sep 17 00:00:00 2001 From: Pavel Holica Date: Mon, 2 Mar 2026 08:34:48 +0100 Subject: [PATCH 1/4] WIP: Initial attempt to improve testing scalability --- .gitmessage | 2 ++ systemtest/plans/main.fmf | 5 +++++ systemtest/plans/rhsm.fmf | 7 +++++++ systemtest/plans/satellite.fmf | 9 +++++++++ 4 files changed, 23 insertions(+) create mode 100644 .gitmessage create mode 100644 systemtest/plans/rhsm.fmf create mode 100644 systemtest/plans/satellite.fmf diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 000000000..d99615042 --- /dev/null +++ b/.gitmessage @@ -0,0 +1,2 @@ +# Hello world! +# THIS IS MY MESSAGE FILE \ No newline at end of file diff --git a/systemtest/plans/main.fmf b/systemtest/plans/main.fmf index 5c5c9fadc..18a145053 100644 --- a/systemtest/plans/main.fmf +++ b/systemtest/plans/main.fmf @@ -21,3 +21,8 @@ prepare: execute: how: tmt + +enabled: false +adjust: + - enabled: true + when: test_event == ctc diff --git a/systemtest/plans/rhsm.fmf b/systemtest/plans/rhsm.fmf new file mode 100644 index 000000000..406b2ccd8 --- /dev/null +++ b/systemtest/plans/rhsm.fmf @@ -0,0 +1,7 @@ +/stage: + environment+: + ENV_FOR_DYNACONF: stage +/prod: + enabled: true + environment+: + ENV_FOR_DYNACONF: prod diff --git a/systemtest/plans/satellite.fmf b/systemtest/plans/satellite.fmf new file mode 100644 index 000000000..25bae2e15 --- /dev/null +++ b/systemtest/plans/satellite.fmf @@ -0,0 +1,9 @@ +/satellite616: + environment+: + ENV_FOR_DYNACONF: satellite616 +/satellite617: + environment+: + ENV_FOR_DYNACONF: satellite617 +/satellite618: + environment+: + ENV_FOR_DYNACONF: satellite618 From 69e9e0cc6f1e6209f0a3a62a6d06201103083759 Mon Sep 17 00:00:00 2001 From: Pavel Holica Date: Thu, 5 Mar 2026 10:03:23 +0100 Subject: [PATCH 2/4] WIP: Make test results better exposed in TMT_TEST_DATA --- systemtest/tests/integration/test.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/systemtest/tests/integration/test.sh b/systemtest/tests/integration/test.sh index efa739c22..5aa5ec2f2 100755 --- a/systemtest/tests/integration/test.sh +++ b/systemtest/tests/integration/test.sh @@ -46,9 +46,11 @@ rpm -q insights-client insights-core selinux-policy || true pytest --log-level debug --junit-xml=./junit.xml -v integration-tests ${PYTEST_FILTER:+-k "${PYTEST_FILTER}"} retval=$? -if [ -d "$TMT_PLAN_DATA" ]; then - cp ./junit.xml "$TMT_PLAN_DATA/junit.xml" - cp -r ./artifacts "$TMT_PLAN_DATA/" -fi +for TARGET_DIR in "$TMT_PLAN_DATA" "$TMT_TEST_DATA"; do + if [ -d "$TARGET_DIR" ]; then + cp ./junit.xml "$TARGET_DIR/junit.xml" + cp -r ./artifacts "$TARGET_DIR/" + fi +done exit $retval From 280efd85134b3d97c5043cce32d23f3969df7a95 Mon Sep 17 00:00:00 2001 From: Pavel Holica Date: Fri, 13 Mar 2026 14:30:33 +0100 Subject: [PATCH 3/4] WIP: script for running tests in TF --- scripts/tf_run.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 scripts/tf_run.py diff --git a/scripts/tf_run.py b/scripts/tf_run.py new file mode 100644 index 000000000..4a7f68919 --- /dev/null +++ b/scripts/tf_run.py @@ -0,0 +1,32 @@ +#!/usr/bin/python3 + +# Request testing +# TESTING_FARM_API_TOKEN=... testing-farm request --no-wait --context test_event=ctc --environment SETTINGS_URL=http://auto-services.usersys.redhat.com/automation-properties/settings.toml --compose RHEL-10-Nightly + +# Download tf resutls.xml (with links to files): https://artifacts.osci.redhat.com/testing-farm/${request_id}/results.xml + +# Download /testsuites/testsuite/testcase/logs[name="data/junit.xml"] + +# Run betelgeuse +# cp $WORKSPACE/junit*.xml $WORKSPACE/${projectName}/ +# cd $WORKSPACE/${projectName} +# echo "Converting results to Polarion format..." +# PYTHONPATH=integration-tests/ betelgeuse --config-module custom_betelgeuse_config \ +# test-run \ +# --custom-fields '{"composeid":"${testImage}","arch":"${archCustom}","description":"${description}","poolteam":"${poolteam}","component":"${component}","fips":"${fips}","assignee":"${assignee}"}' \ +# --test-run-title "${testRunTitle}" \ +# --no-include-skipped \ +# $WORKSPACE/${projectName}/junit*.xml \ +# ./integration-tests/ \ +# automation \ +# RHELSS \ +# test_run.xml +# +# Upload to Polarion +# echo "Uploading to Polarion..." +# curl -k -u "$POLARION_USER:$POLARION_PASS" \ +# -X POST \ +# -F file=@test_run.xml \ +# https://polarion.engineering.redhat.com/polarion/import/xunit +# +# echo "Polarion upload complete" From a24cf221b84483b2f2cdbbdff2ec54563ad7c59d Mon Sep 17 00:00:00 2001 From: Pavel Holica Date: Fri, 29 May 2026 12:44:40 +0200 Subject: [PATCH 4/4] Update satellite versions --- systemtest/plans/satellite.fmf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systemtest/plans/satellite.fmf b/systemtest/plans/satellite.fmf index 25bae2e15..5ed3bc8f6 100644 --- a/systemtest/plans/satellite.fmf +++ b/systemtest/plans/satellite.fmf @@ -1,9 +1,9 @@ -/satellite616: - environment+: - ENV_FOR_DYNACONF: satellite616 /satellite617: environment+: ENV_FOR_DYNACONF: satellite617 /satellite618: environment+: ENV_FOR_DYNACONF: satellite618 +/satellite619: + environment+: + ENV_FOR_DYNACONF: satellite619