Merge branch 'main' into rebase/forgejo

Author: mynk8

.github/workflows/check-release-notes.yml

@@ -10,6 +10,6 @@ on:
 jobs:
   check_release_notes:
     name: Notes are either written, or there are none
-    uses: packit/.github/.github/workflows/check-release-notes.yml@main
+    uses: packit/.github/.github/workflows/check-release-notes.yml@2837c96caf71966609451ad0323552ef4be11a23
     with:
       description: ${{ github.event.pull_request.body }}

.github/workflows/opened-prs-to-the-board.yml

@@ -8,7 +8,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v0.3.0
+      - uses: actions/add-to-project@a9f041ddd462ed185893ea1024cec954f50dbe42 # v0.3.0
         with:
           project-url: https://github.com/orgs/packit/projects/14
           github-token: ${{ secrets.RELEASEBOT_GITHUB_TOKEN }}

.github/workflows/rebuild-and-push-images.yml

@@ -22,7 +22,7 @@ jobs:
             image: packit-service-tests
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
 
       - name: Install QEMU dependency
         run: |
@@ -50,7 +50,7 @@ jobs:
       - name: Build Image
         id: build-image
         # https://github.com/marketplace/actions/buildah-build
-        uses: redhat-actions/buildah-build@v2
+        uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2
         with:
           dockerfiles: ${{ matrix.dockerfile }}
           image: ${{ matrix.image }}
@@ -63,7 +63,7 @@ jobs:
 
       - name: Push To Quay
         # https://github.com/marketplace/actions/push-to-registry
-        uses: redhat-actions/push-to-registry@v2
+        uses: redhat-actions/push-to-registry@5ed88d269cf581ea9ef6dd6806d01562096bee9c # v2
         with:
           image: ${{ steps.build-image.outputs.image }}
           tags: ${{ steps.build-image.outputs.tags }}

.pre-commit-config.yaml

@@ -4,13 +4,14 @@
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.6
+    rev: 6fec9b7edb08fd9989088709d864a7826dc74e80 # frozen: v0.15.12
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
+  # 1.18.2 is the last mypy version compatible with Python 3.9
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.18.2
+    rev: 9f70dc58c23dfcca1b97af99eaeee3140a807c7e # frozen: v1.18.2
     hooks:
       - id: mypy
         args: [
@@ -36,12 +37,12 @@ repos:
           ]
         exclude: files/scripts/
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
+    rev: f12edd9c7be1c20cfa42420fd0e6df71e42b51ea # frozen: v4.0.0-alpha.8
     hooks:
       - id: prettier
         exclude: tests_openshift/openshift_integration/test_data/
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -60,18 +61,18 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.11.0.1
+    rev: 745eface02aef23e168a8afb6b5737818efbea95 # frozen: v0.11.0.1
     hooks:
       - id: shellcheck
   - repo: https://github.com/packit/pre-commit-hooks
-    rev: v1.3.0
+    rev: ce4b530e5913c1b8651127ace81996464975ef48 # frozen: v1.3.0
     hooks:
       - id: check-rebase
         args:
           - https://github.com/packit/packit-service.git
         stages: [manual, pre-push]
   - repo: https://github.com/packit/requre
-    rev: 0.9.1
+    rev: 5b8a0a853928a9bb6204f3a66c510a62cf53fcb7 # frozen: 0.9.1
     hooks:
       - id: requre-purge
         name: Requre response files cleanup
@@ -96,19 +97,19 @@ repos:
         files: /tests_openshift.*\.yaml$
         stages: [manual, pre-push]
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.29.1
+    rev: 2ca41cc1372d1e939a6a879f18cdc19fc1cac1ce # frozen: v8.30.0
     hooks:
       - id: gitleaks
         # The hook runs 'gitleaks protect --staged' which parses output of
         # 'git diff --staged', i.e. always passes in pre-push/manual stage.
         stages: [pre-commit]
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.35.0
+    rev: 943377262562a12b57292fc98fabd7dbf81451fe # frozen: 0.37.2
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.5.5
+    rev: ad1b27d73581aa16cca06fc4a0761fc563ffe8e8 # frozen: v1.5.6
     hooks:
       - id: insert-license
         files: \.py$

packit_service/worker/checker/testing_farm.py

@@ -3,6 +3,7 @@
 
 import logging
 import os
+from pathlib import PurePosixPath
 from typing import Optional
 
 from packit_service.constants import (
@@ -342,7 +343,14 @@ def pre_check(self) -> bool:
             commit_sha = self.data.event_dict.get("commit_sha")
 
             self.project.get_file_content(
-                path=".fmf/version",
+                path=str(
+                    PurePosixPath(
+                        self.job_config.fmf_path.removeprefix("/")
+                        if self.job_config and self.job_config.fmf_path
+                        else "",
+                        ".fmf/version",
+                    )
+                ),
                 ref=commit_sha,
             )
         except FileNotFoundError:

packit_service/worker/helpers/testing_farm.py

@@ -691,7 +691,10 @@ def is_fmf_configured(self) -> bool:
             return True
 
         return IsFMFConfigPresent(
-            package_config=None, job_config=None, event=self.metadata.event_dict, task_name=None
+            package_config=None,
+            job_config=self.job_config,
+            event=self.metadata.event_dict,
+            task_name=None,
         ).pre_check()
 
     def report_missing_build_chroot(self, chroot: str):

packit_service/worker/jobs.py

@@ -645,6 +645,12 @@ def process_fedora_ci_jobs(self) -> list[TaskResults]:
         handlers_triggered_by_job = None
         check_target = None
 
+        if self.event.db_project_event:
+            self.event.cancel_cutoff_time = PipelineModel.get_latest_datetime_for_event(
+                project_event_type=self.event.db_project_event.type,
+                event_id=self.event.db_project_event.event_id,
+            )
+
         # [XXX] if there are ever monorepos in Fedora CI…
         # monorepo_package = None
         if isinstance(self.event, abstract.comment.CommentEvent):

packit_service/worker/parser.py

@@ -1928,7 +1928,7 @@ def parse_logdetective_analysis_event(event) -> Optional[logdetective.Result]:
             analysis_id=analysis_id
         )
         if not log_detective_run:
-            logger.error(
+            logger.info(
                 f"Received results Log Detective analysis: '{analysis_id}' "
                 "but no analysis with this id was requested."
             )

tests/integration/test_dg_pr.py

@@ -122,7 +122,10 @@ def test_downstream_koji_scratch_build(distgit_pr_event, target_branch, uid, che
         project=flexmock(project_url="https://src.fedoraproject.org/rpms/optee_os"),
     )
     db_project_event = (
-        flexmock().should_receive("get_project_event_object").and_return(db_project_object).mock()
+        flexmock(type=ProjectEventModelType.pull_request, event_id=9)
+        .should_receive("get_project_event_object")
+        .and_return(db_project_object)
+        .mock()
     )
     flexmock(ProjectEventModel).should_receive("get_or_create").with_args(
         type=ProjectEventModelType.pull_request,

tests/integration/test_koji_build_cancel.py

@@ -517,3 +517,73 @@ def test_downstream_koji_build_cancel_uses_event_based_filtering(monkeypatch):
         job_config=job_config,
     )
     assert first_dict_value(results["job"])["success"]
+
+
+def test_downstream_koji_scratch_build_cancel_uses_event_based_filtering(
+    mock_distgit_pr_functionality,
+    monkeypatch,
+):
+    """Test that cancel_cutoff_time is set for Fedora CI scratch builds.
+
+    The Fedora CI code path (process_fedora_ci_jobs) used to skip setting
+    cancel_cutoff_time because it didn't call create_tasks(). This test
+    verifies the fix: process_fedora_ci_jobs now queries
+    PipelineModel.get_latest_datetime_for_event and serializes the cutoff
+    into the event dict, so the handler can cancel stale builds.
+    """
+    monkeypatch.setenv("CANCEL_RUNNING_JOBS", "1")
+
+    cutoff_time = datetime(2025, 1, 15, 10, 30, 0, tzinfo=timezone.utc)
+
+    # Override the autouse fixture mock — return a specific cutoff time
+    flexmock(PipelineModel).should_receive("get_latest_datetime_for_event").with_args(
+        project_event_type=ProjectEventModelType.pull_request,
+        event_id=9,
+    ).and_return(cutoff_time).once()
+
+    # Mocks for the build execution flow inside _run()
+    flexmock(PackitAPI).should_receive("init_kerberos_ticket")
+    koji_build_target = flexmock(
+        id=123,
+        target="main",
+        status="queued",
+        set_status=lambda x: None,
+        set_task_id=lambda x: None,
+        set_web_url=lambda x: None,
+        set_build_logs_urls=lambda x: None,
+        set_data=lambda x: None,
+        set_build_submission_stdout=lambda x: None,
+    )
+    flexmock(KojiBuildTargetModel).should_receive("create").and_return(koji_build_target)
+    flexmock(KojiBuildGroupModel).should_receive("create").and_return(
+        flexmock(grouped_targets=[koji_build_target]),
+    )
+    flexmock(commands).should_receive("run_command_remote").and_return(
+        flexmock(stdout="some output"),
+    )
+    flexmock(distgit_handlers).should_receive("get_koji_task_id_and_url_from_stdout").and_return(
+        (123, "koji-web-url"),
+    )
+
+    # The key assertion: get_running must be called with event-based parameters
+    flexmock(KojiBuildGroupModel).should_receive("get_running").with_args(
+        project_event_type=ProjectEventModelType.pull_request,
+        event_id=9,
+        created_before=cutoff_time,
+        targets=None,
+    ).and_return([]).once()
+
+    processing_results = SteveJobs().process_message(mock_distgit_pr_functionality)
+    event_dict, _, job_config, package_config = get_parameters_from_results(
+        processing_results[:1],
+    )
+
+    # Verify that cancel_cutoff_time was serialized into the event dict
+    assert event_dict.get("cancel_cutoff_time") == cutoff_time.timestamp()
+
+    results = run_downstream_koji_scratch_build_handler(
+        package_config=package_config,
+        event=event_dict,
+        job_config=job_config,
+    )
+    assert first_dict_value(results["job"])["success"]