From 1310277f610e452d0c80f229b9931052b7580197 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Mon, 3 Jul 2023 14:13:19 -0400
Subject: [PATCH 1/3] USHIFT-1387: add scenario test run script

---
 test/bin/ci_phase_test.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100755 test/bin/ci_phase_test.sh

diff --git a/test/bin/ci_phase_test.sh b/test/bin/ci_phase_test.sh
new file mode 100755
index 0000000000..f5373fa89c
--- /dev/null
+++ b/test/bin/ci_phase_test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# This script runs on the CI cluster, from the metal-tests step.
+
+set -xeuo pipefail
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source "${SCRIPTDIR}/common.sh"
+
+cd "${TESTDIR}"
+
+for scenario in ./scenarios/*.sh; do
+    scenario_name="$(basename "${scenario}" .sh)"
+    logfile="${SCENARIO_INFO_DIR}/${scenario_name}/run.log"
+    mkdir -p "$(dirname "${logfile}")"
+    bash -x ./bin/scenario.sh run "${scenario}" >"${logfile}" 2>&1 &
+done
+
+FAIL=0
+for job in $(jobs -p) ; do
+    jobs -l
+    echo "Waiting for job: ${job}"
+    wait "${job}" || ((FAIL+=1))
+done
+
+echo "Test phase complete"
+if [[ ${FAIL} -ne 0 ]]; then
+    exit 1
+fi

From fc864a5c0080126f51be8283dbbcbebd3b3f34b7 Mon Sep 17 00:00:00 2001
From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
Date: Sun, 9 Jul 2023 00:56:50 +0200
Subject: [PATCH 2/3] USHIFT-1387: install rf dependencies before running
 scenarios

---
 test/bin/ci_phase_test.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/bin/ci_phase_test.sh b/test/bin/ci_phase_test.sh
index f5373fa89c..66ec3dc853 100755
--- a/test/bin/ci_phase_test.sh
+++ b/test/bin/ci_phase_test.sh
@@ -9,6 +9,10 @@ source "${SCRIPTDIR}/common.sh"
 
 cd "${TESTDIR}"
 
+if [ ! -d "${RF_VENV}" ]; then
+    "${ROOTDIR}/scripts/fetch_tools.sh" robotframework
+fi
+
 for scenario in ./scenarios/*.sh; do
     scenario_name="$(basename "${scenario}" .sh)"
     logfile="${SCENARIO_INFO_DIR}/${scenario_name}/run.log"

From 1c11224366f877597bc40f37970e16b96425c08c Mon Sep 17 00:00:00 2001
From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
Date: Sun, 9 Jul 2023 01:02:38 +0200
Subject: [PATCH 3/3] USHIFT-1387: adjust default ssh private key in scenarios

---
 test/bin/scenario.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/bin/scenario.sh b/test/bin/scenario.sh
index a77a80a06f..a3bb32623e 100755
--- a/test/bin/scenario.sh
+++ b/test/bin/scenario.sh
@@ -255,7 +255,7 @@ API_PORT: ${api_port}
 LB_PORT: ${lb_port}
 USHIFT_HOST: ${public_ip}
 USHIFT_USER: redhat
-SSH_PRIV_KEY: "${SSH_PRIVATE_KEY:-}"
+SSH_PRIV_KEY: ${SSH_PRIVATE_KEY:-${HOME}/.ssh/id_rsa}
 SSH_PORT: ${ssh_port}
 EOF