diff --git a/daily_tests/daily_nightly_tests_report.py b/daily_tests/daily_nightly_tests_report.py index 7184eb5..552f9d9 100755 --- a/daily_tests/daily_nightly_tests_report.py +++ b/daily_tests/daily_nightly_tests_report.py @@ -83,11 +83,17 @@ "nightly-container-rhel9", "RHEL-9 Helm Charts test results:", ), + ("rhel10-test", "nightly-container-rhel10", "RHEL-10 test results:"), } TEST_UPSTREAM_CASES = { ("rhel8-test-upstream", "nightly-container-rhel8", "RHEL-8 Upstream test results:"), ("rhel9-test-upstream", "nightly-container-rhel9", "RHEL-9 Upstream test results:"), + ( + "rhel10-test-upstream", + "nightly-container-rhel10", + "RHEL-10 Upstream test results:", + ), } # The default directory used for nightly build diff --git a/prepare_machine.sh b/prepare_machine.sh index cea14c1..6e3699c 100755 --- a/prepare_machine.sh +++ b/prepare_machine.sh @@ -2,7 +2,7 @@ set -x -LOGS_DIR="/home/fedora/logs" +LOGS_DIR="$HOME/logs" DAILY_TEST_DIR="/var/tmp/daily_scl_tests" WORK_DIR=$(mktemp -d -p "/var/tmp") REPORTS_DIR="/var/tmp/daily_reports_dir" diff --git a/run_nightly_helm_charts.sh b/run_nightly_helm_charts.sh index 09b06c2..26c0c32 100755 --- a/run_nightly_helm_charts.sh +++ b/run_nightly_helm_charts.sh @@ -2,7 +2,7 @@ set -x -LOGS_DIR="/home/fedora/logs" +LOGS_DIR="$HOME/logs" TARGET="rhel9" TMT_REPO="https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans" diff --git a/run_nightly_tests.sh b/run_nightly_tests.sh index 0c4e2a4..1ce95ae 100755 --- a/run_nightly_tests.sh +++ b/run_nightly_tests.sh @@ -2,7 +2,7 @@ set -x -LOGS_DIR="/home/fedora/logs" +LOGS_DIR="$HOME/logs" [[ -z "$1" ]] && { echo "You have to specify target to build SCL images. rhel9, rhel8, or fedora" && exit 1 ; } TARGET="$1" shift @@ -25,6 +25,8 @@ if [[ "$TARGET" == "rhel8" ]]; then COMPOSE="1MT-RHEL-8.10.0-updates" elif [[ "$TARGET" == "rhel9" ]]; then COMPOSE="1MT-RHEL-9.4.0-updates" +elif [[ "$TARGET" == "rhel10" ]]; then + COMPOSE="1MT-RHEL-10.0" elif [[ "$TARGET" == "fedora" ]]; then COMPOSE="1MT-Fedora-40" TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" @@ -59,7 +61,7 @@ SCRIPT="daily_scl_tests" WORK_DIR=$(mktemp -d -p "/var/tmp") git clone "$TMT_REPO" "$WORK_DIR/$TMT_DIR" CWD=$(pwd) -cd /home/fedora || { echo "Could not switch to /home/fedora"; exit 1; } +cd $HOME || { echo "Could not switch to $HOME"; exit 1; } if [[ ! -d "${LOGS_DIR}" ]]; then mkdir -p "${LOGS_DIR}" fi