From cf34cd5b3a2608aa70771ad6f8a00b096069a533 Mon Sep 17 00:00:00 2001
From: Naga Ravi Chaitanya Elluri <nelluri@redhat.com>
Date: Thu, 5 Sep 2024 00:13:13 -0400
Subject: [PATCH] Add junit xml parameters

Tweak container and time scenarios to use them for Sippy to scrape them.

Signed-off-by: Naga Ravi Chaitanya Elluri <nelluri@redhat.com>
---
 container-scenarios/prow_run.sh | 11 ++++++++++-
 pod-scenarios/prow_run.sh       |  4 ++--
 time-scenarios/prow_run.sh      | 12 +++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/container-scenarios/prow_run.sh b/container-scenarios/prow_run.sh
index 3c66c22..d52dcaf 100755
--- a/container-scenarios/prow_run.sh
+++ b/container-scenarios/prow_run.sh
@@ -24,5 +24,14 @@ envsubst < config.yaml.template > /tmp/container_scenario_config.yaml
 # Run Kraken
 cat /tmp/container_scenario_config.yaml
 cat /tmp/container_scenario.yaml
-python3.9 $krkn_loc/run_kraken.py --config=/tmp/container_scenario_config.yaml -o /tmp/report.out
 
+[ -z $JUNIT_TESTCASE ] && JUNIT_TESTCASE="container-scenarios"
+[ -z $ARTIFACT_DIR ] && ARTIFACT_DIR="/tmp"
+
+TEST_VERSION=`oc version -o json | jq .openshiftVersion`
+
+python3.9 $krn_loc/run_kraken.py --config=/tmp/container_scenario_config.yaml \
+-o /tmp/report.out \
+--junit-testcase "$JUNIT_TESTCASE" \
+--junit-testcase-path "$ARTIFACT_DIR" \
+--junit-testcase-version "$TEST_VERSION"
diff --git a/pod-scenarios/prow_run.sh b/pod-scenarios/prow_run.sh
index d94de38..a8154c1 100755
--- a/pod-scenarios/prow_run.sh
+++ b/pod-scenarios/prow_run.sh
@@ -30,7 +30,7 @@ envsubst < config.yaml.template > /tmp/pod_scenario_config.yaml
 cat /tmp/pod_scenario_config.yaml
 cat /tmp/pod_scenario.yaml
 
-[ -z $JUNIT_TESTCASE ] && JUNIT_TESTCASE="Pod scenarios"
+[ -z $JUNIT_TESTCASE ] && JUNIT_TESTCASE="pod-scenarios"
 [ -z $ARTIFACT_DIR ] && ARTIFACT_DIR="/tmp"
 
 TEST_VERSION=`oc version -o json | jq .openshiftVersion`
@@ -39,4 +39,4 @@ python3.9 $krn_loc/run_kraken.py --config=/tmp/pod_scenario_config.yaml \
 -o /tmp/report.out \
 --junit-testcase "$JUNIT_TESTCASE" \
 --junit-testcase-path "$ARTIFACT_DIR" \
---junit-testcase-version "$TEST_VERSION"
\ No newline at end of file
+--junit-testcase-version "$TEST_VERSION"
diff --git a/time-scenarios/prow_run.sh b/time-scenarios/prow_run.sh
index cd28dfe..b069047 100755
--- a/time-scenarios/prow_run.sh
+++ b/time-scenarios/prow_run.sh
@@ -25,4 +25,14 @@ envsubst < config.yaml.template > /tmp/time_scenario_config.yaml
 # Run Kraken
 cat /tmp/time_scenario_config.yaml
 cat /tmp/time_scenario.yaml
-python3.9 $krkn_loc/run_kraken.py --config=/tmp/time_scenario_config.yaml -o /tmp/report.out
+
+[ -z $JUNIT_TESTCASE ] && JUNIT_TESTCASE="time-scenarios"
+[ -z $ARTIFACT_DIR ] && ARTIFACT_DIR="/tmp"
+
+TEST_VERSION=`oc version -o json | jq .openshiftVersion`
+
+python3.9 $krn_loc/run_kraken.py --config=/tmp/time_scenario_config.yaml \
+-o /tmp/report.out \
+--junit-testcase "$JUNIT_TESTCASE" \
+--junit-testcase-path "$ARTIFACT_DIR" \
+--junit-testcase-version "$TEST_VERSION"