Skip to content

Fix switching to proper plan #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phracek merged 2 commits into from
Jan 22, 2026
Merged

Fix switching to proper plan #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c27f048
Fix switching to proper plan
phracek Jan 22, 2026
9662b88
Fix switching to proper plan
phracek Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
dockerfile: Dockerfile.daily-tests
tag: "0.2.0"
tag: "0.3.0"
image_name: "upstream-daily-tests"
quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
2 changes: 1 addition & 1 deletion Dockerfile.daily-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/fedora/fedora:42

ENV WORK_DIR="/var/tmp" \
VERSION="42" \
RELEASE="0.2.0" \
RELEASE="0.3.0" \
DOWNSTREAM_TMT_DIR="sclorg-tmt-plans" \
UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
UPSTREAM_TMT_DIR="sclorg-testing-farm" \
Expand Down
46 changes: 26 additions & 20 deletions run_nightly_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,31 @@ if [[ "${TESTS}" != "test-upstream" ]]; then
SET_TEST="$TEST_TYPE"
fi

LOGS_DIR="/var/tmp/daily_tests_logs/"
LOGS_DIR="${WORK_DIR}/daily_tests_logs/"
LOGS_DIR_OLD="${LOGS_DIR}/old"
DAILY_TEST_DIR="/var/tmp/daily_scl_tests"
RESULTS_DIR="/var/tmp/daily_reports_dir"
DAILY_TEST_DIR="${WORK_DIR}/daily_scl_tests"
RESULTS_DIR="${WORK_DIR}/daily_reports_dir"
RESULTS_DIR_OLD="${RESULTS_DIR}/old"
SCRIPT="daily_scl_tests"
TMT_DIR="sclorg-tmt-plans"
TFT_PLAN="nightly-container-$TARGET"
DIR="${DAILY_TEST_DIR}/${TARGET}-${TESTS}-${SET_TEST}"
RESULTS_TARGET_DIR="${RESULTS_DIR}/${TARGET}-${TESTS}"
if [[ "$TESTS" == "test-upstream" ]]; then
DIR="${DAILY_TEST_DIR}/${TARGET}-${TESTS}"
fi
LOG_FILE="${LOGS_DIR}/${TARGET}-${TESTS}.log"
WORK_DIR=$(mktemp -d -p "/var/tmp")

function move_logs_to_old() {
rm -rf "${LOGS_DIR_OLD}/*"
rm -rf "${RESULTS_DIR_OLD}/*"
mv "${LOG_FILE}" "${LOGS_DIR_OLD}/"
mv "${RESULTS_TARGET_DIR}" "${RESULTS_DIR_OLD}/"
echo "Moving logs to old directory"
if [[ -d "${LOGS_DIR_OLD}" ]]; then
rm -rf "${LOGS_DIR_OLD}/*"
fi
if [[ -d "${RESULTS_DIR_OLD}" ]]; then
rm -rf "${RESULTS_DIR_OLD}/*"
fi
mv "${LOG_FILE}/*" "${LOGS_DIR_OLD}/"
mv "${RESULTS_TARGET_DIR}/*" "${RESULTS_DIR_OLD}/"
echo "Logs moved to old directory"
}

function prepare_environment() {
Expand All @@ -51,22 +55,22 @@ function prepare_environment() {
function get_compose() {
if [[ "$TARGET" == "rhel8" ]]; then
COMPOSE="1MT-RHEL-8.10.0-updates"
TMT_DIR="$DOWNSTREAM_TMT_DIR"
TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
elif [[ "$TARGET" == "rhel9" ]]; then
COMPOSE="1MT-RHEL-9.6.0-updates"
TMT_DIR="$DOWNSTREAM_TMT_DIR"
TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
elif [[ "$TARGET" == "rhel10" ]]; then
COMPOSE="1MT-RHEL-10.0"
TMT_DIR="$DOWNSTREAM_TMT_DIR"
TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
elif [[ "$TARGET" == "fedora" ]]; then
COMPOSE="1MT-Fedora-40"
TMT_DIR="$UPSTREAM_TMT_DIR"
TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
elif [[ "$TARGET" == "c9s" ]]; then
COMPOSE="1MT-CentOS-Stream-9"
TMT_DIR="$UPSTREAM_TMT_DIR"
TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
elif [[ "$TARGET" == "c10s" ]]; then
COMPOSE="1MT-CentOS-Stream-10"
TMT_DIR="$UPSTREAM_TMT_DIR"
TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
else
echo "This target is not supported"
exit 1
Expand All @@ -83,10 +87,10 @@ function run_tests() {
ENV_VARIABLES="$ENV_VARIABLES -e SET_TEST=$SET_TEST"
fi
TMT_COMMAND="tmt run -v -v -d -d --all ${ENV_VARIABLES} --id ${DIR} plan --name $TFT_PLAN provision --how minute --auto-select-network --image ${COMPOSE}"
echo "TMT command is: $TMT_COMMAND" | tee -a "${LOG}"
echo "TMT command is: $TMT_COMMAND" | tee -a "${LOG_FILE}"
touch "${RESULTS_TARGET_DIR}/tmt_running"
set -o pipefail
$TMT_COMMAND | tee -a "${LOG}"
$TMT_COMMAND | tee -a "${LOG_FILE}"
if [[ $? -ne 0 ]]; then
echo "TMT command $TMT_COMMAND has failed."
if [[ -f "${RESULTS_TARGET_DIR}/tmt_success" ]]; then
Expand Down Expand Up @@ -125,12 +129,14 @@ get_compose

move_logs_to_old

date > "${LOG}"
date > "${LOG_FILE}"
curl --insecure -L https://url.corp.redhat.com/fmf-data > "/tmp/fmf_data"
source "/tmp/fmf_data"

cd "$WORK_DIR/$TMT_DIR" || { echo "Could not switch to $WORK_DIR/$TMT_DIR"; exit 1; }
echo "TARGET is: ${TARGET} and test is: ${TESTS}" | tee -a "${LOG}"
env
echo "Switching to $WORK_DIR/$TMT_PLAN_DIR"
cd "$WORK_DIR/$TMT_PLAN_DIR" || { echo "Could not switch to $WORK_DIR/$TMT_PLAN_DIR"; exit 1; }
echo "TARGET is: ${TARGET} and test is: ${TESTS}" | tee -a "${LOG_FILE}"

run_tests

Expand Down