Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
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.7.0"
tag: "0.7.1"
image_name: "upstream-daily-tests"
quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
2 changes: 1 addition & 1 deletion Dockerfile.daily-tests
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/fedora/fedora:42

ENV SHARED_DIR="/var/ci-scripts" \
VERSION="42" \
RELEASE_UPSTREAM="0.7.0" \
RELEASE_UPSTREAM="0.7.1" \
UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
UPSTREAM_TMT_DIR="sclorg-testing-farm" \
HOME="/home/nightly" \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ shellcheck:
./run-shellcheck.sh `git ls-files *.sh`

build_images:
podman build -t quay.io/sclorg/upstream-daily-tests:0.7.0 -f Dockerfile.daily-tests .
podman build -t quay.io/sclorg/upstream-daily-tests:0.7.1 -f Dockerfile.daily-tests .
4 changes: 1 addition & 3 deletions daily_tests/show_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ def iter_results_in_directory(self):
success_tmt_plans.append(item.name)
else:
failed_tmt_plans.append(item.name)
failed_container_tests.extend(
self.return_failed_tests(self.item_dir, item)
)
failed_container_tests.extend(self.return_failed_tests(item_dir, item))
if running_tmt_plans:
print("Running TMT plans that are not finished yet:")
print("\n".join(running_tmt_plans))
Expand Down
7 changes: 3 additions & 4 deletions daily_tests/tests/test_show_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def report_env(tmp_path):


def test_return_failed_tests_finds_logs(tmp_path):
item_name = "c9s-example"
item_name = "c9s-test"
base_dir = tmp_path
logs_dir = (
base_dir / item_name / "plans/nightly/nightly-c9s/data/results" / "nested"
Expand All @@ -56,7 +56,7 @@ def test_return_failed_tests_finds_logs(tmp_path):
def test_iter_over_executed_tests_no_failures(report_env, capsys):
report, _, _ = report_env
report.scl_tests_dir.mkdir(parents=True)
(report.scl_tests_dir / "c9s-run").mkdir()
(report.scl_tests_dir / "c9s-test").mkdir()

report.iter_over_executed_tests()
output = capsys.readouterr().out
Expand Down Expand Up @@ -112,11 +112,10 @@ def test_iter_results_in_directory_summarizes(report_env, capsys):
report.iter_results_in_directory()
output = capsys.readouterr().out

print(output)
assert "Running TMT plans" in output
assert "rhel9-test-pytest" in output
assert "Success TMT plans" in output
assert "c9s-test" in output
assert "Failed TMT plans" in output
assert "rhel9-test" in output
assert "Failed container tests" in output
assert "fail.log" in output