Bump version and fix SUCCESS_DATA list

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

.github/workflows/build-and-push.yml

@@ -19,7 +19,7 @@ jobs:
           registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
           registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
           dockerfile: Dockerfile.daily-tests
-          tag: "0.10.7"
+          tag: "0.10.8"
           image_name: "upstream-daily-tests"
           quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
 
@@ -31,6 +31,6 @@ jobs:
           registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
           registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
           dockerfile: Dockerfile.eol-checker
-          tag: "0.10.7"
+          tag: "0.10.8"
           image_name: "upstream-eol-checker"
           quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}

Dockerfile.daily-tests

@@ -2,7 +2,7 @@ FROM quay.io/fedora/fedora:42
 
 ENV SHARED_DIR="/var/ci-scripts" \
     VERSION="42" \
-    RELEASE_UPSTREAM="0.10.7" \
+    RELEASE_UPSTREAM="0.10.8" \
     UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
     UPSTREAM_TMT_DIR="sclorg-testing-farm" \
     HOME="/home/nightly" \

Dockerfile.eol-checker

@@ -1,7 +1,7 @@
 FROM quay.io/fedora/fedora:42
 
 ENV VERSION="42" \
-    RELEASE_UPSTREAM="0.10.7" \
+    RELEASE_UPSTREAM="0.10.8" \
     HOME="/home/eol-checker" \
     SUMMARY="EOL checker for SCL org projects" \
     DESCRIPTION="This image is used to run EOL checker for SCL org projects in CI." \

daily-tests/daily_tests/daily_nightly_tests_report.py

@@ -346,9 +346,9 @@ def collect_data(self):
                         self.store_tmt_logs_to_dict(
                             path_dir=path_dir, test_case=test_case, is_failed=False
                         )
-                    self.data_dict["SUCCESS_DATA"].extend(
-                        [(test_case, str(f), str(f.name)) for f in success_logs]
-                    )
+                    for f in success_logs:
+                        print(f"Success log for {test_case} is: {f}")
+                        self.data_dict["SUCCESS_DATA"].append((test_case, str(f), str(f.name)))
                 continue
             print(f"Failed containers are for {test_case} are: {failed_containers}")
             failed_tests = True
@@ -429,7 +429,7 @@ def generate_success_containers(self):
         """
         Generate email body for successful containers.
         """
-        print("GENERATE SUCCESS CONTAINERS")
+        print(f"GENERATE SUCCESS CONTAINERS {self.data_dict['SUCCESS_DATA']}")
         for test_case, cont_path, log_name in self.data_dict["SUCCESS_DATA"]:
             if os.path.exists(log_name):
                 paste_bin_file = f"{cont_path}.txt"

daily-tests/tests/test_reports.py

@@ -183,9 +183,34 @@ def test_collect_data_full_success_when_no_failed_logs(self, collect_report):
 
         assert collect_report.full_success is True
         assert collect_report.data_dict["SUCCESS"] == ["fedora-test"]
+        assert collect_report.data_dict["SUCCESS_DATA"] == []
         assert collect_report.data_dict["tmt"]["tmt_running"] == []
         assert collect_report.data_dict["tmt"]["tmt_failed"] == []
 
+    def test_collect_data_records_success_data_for_upstream_logs(self, collect_report):
+        collect_report.args.upstream_tests = True
+        case_dir = collect_report.reports_dir / "fedora-test"
+        (case_dir / "results").mkdir(parents=True)
+        success_log = case_dir / "success.log"
+        success_log.write_text("success", encoding="utf-8")
+        second_case_dir = collect_report.reports_dir / "rhel-test"
+        (second_case_dir / "results").mkdir(parents=True)
+        second_success_log = second_case_dir / "success.log"
+        second_success_log.write_text("success", encoding="utf-8")
+        collect_report.available_test_case = {
+            ("fedora-test", "nightly-fedora", "Fedora test results:"),
+            ("rhel-test", "nightly-rhel", "RHEL test results:"),
+        }
+
+        collect_report.collect_data()
+
+        assert sorted(collect_report.data_dict["SUCCESS_DATA"]) == sorted(
+            [
+                ("fedora-test", str(success_log), "success.log"),
+                ("rhel-test", str(second_success_log), "success.log"),
+            ]
+        )
+
     def test_collect_data_records_failed_container_logs(self, collect_report):
         case_dir = collect_report.reports_dir / "fedora-test"
         log_file = case_dir / "results" / "ns" / "failed.log"

tox.ini

@@ -7,6 +7,7 @@ commands = python3 -m pytest --color=yes -v --cov=daily_tests --cov-report=xml:c
 deps =
     pytest
     pytest-cov
+    flexmock
     PyYAML
     requests
     xmltodict