Skip to content

Support rhel10 #159

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.

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
merged 2 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 18 additions & 10 deletions daily_tests/daily_nightly_tests_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -282,20 +288,22 @@ def generate_failed_containers(self):
def generate_success_containers(self):
for test_case, cont_path, log_name in self.data_dict["SUCCESS_DATA"]:
mime_name = f"{test_case}-{log_name}"
attach = MIMEApplication(open(cont_path, "r").read(), Name=mime_name)
attach.add_header(
"Content-Disposition", 'attachment; filename="{}"'.format(mime_name)
)
self.mime_msg.attach(attach)
if os.path.exists(cont_path):
attach = MIMEApplication(open(cont_path, "r").read(), Name=mime_name)
attach.add_header(
"Content-Disposition", 'attachment; filename="{}"'.format(mime_name)
)
self.mime_msg.attach(attach)

def generate_tmt_logs_containers(self):
for test_case, cont_path, log_name in self.data_dict["tmt"]["logs"]:
mime_name = f"{test_case}-{log_name}"
attach = MIMEApplication(open(cont_path, "r").read(), Name=mime_name)
attach.add_header(
"Content-Disposition", 'attachment; filename="{}"'.format(mime_name)
)
self.mime_msg.attach(attach)
if os.path.exists(cont_path):
attach = MIMEApplication(open(cont_path, "r").read(), Name=mime_name)
attach.add_header(
"Content-Disposition", 'attachment; filename="{}"'.format(mime_name)
)
self.mime_msg.attach(attach)

def generate_emails(self):
for test_case, plan, _ in self.available_test_case:
Expand Down
2 changes: 1 addition & 1 deletion prepare_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion run_nightly_helm_charts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions run_nightly_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down