Add patch-git support

Follow the instructions in konflux-ci/rpmbuild-pipeline#112

Author: praiskup

.github/workflows/gh-action-testsuite.yaml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: install needed RPMs
-        run: dnf install -y python3-norpm python3-pip python3-specfile koji patch
+        run: dnf install -y python3-norpm python3-pip python3-specfile koji patch git
 
       - name: patch rpmdiff
         run: patch /usr/lib/python3.14/site-packages/koji/rpmdiff.py < rpmdiff.patch

.gitignore

@@ -1,6 +1,7 @@
 .coverage
 __pycache__
 tests/results.json
+test-git-repos/
 test-source-rpms/
 trace
 tests/sbom_merged.json

Containerfile

@@ -32,6 +32,8 @@ ADD python_scripts/select_architectures.py /usr/local/bin/select_architectures.p
 # TODO: We need to find a better place for this datafile (and autogenerate it)
 ADD arch-specific-macro-overrides.json /etc/arch-specific-macro-overrides.json
 
+ADD patch-git-prepare.sh /usr/bin
+
 # TODO: Find a better way to ensure that we never execute RPMSpecParser in Konflux.
 RUN sed -i 's/# Note: These calls will alter the results of any subsequent macro expansion/sys.exit(1)/' \
     /usr/lib/python3.*/site-packages/rpmautospec/specparser.py

patch-git-prepare.sh

@@ -0,0 +1,11 @@
+#! /bin/sh -x
+
+# See these discussions:
+# https://github.com/konflux-ci/rpmbuild-pipeline/issues/112
+# https://github.com/konflux-ci/rpmbuild-pipeline-environment-container/pull/105
+
+set -e
+export TZ=UTC LC_ALL=C.utf8
+git log --first-parent --no-decorate --no-renames --raw --pretty=fuller --date=default > patch-git-generated-log.txt
+git rev-parse HEAD > patch-git-generated-commit.txt
+echo v1 >> patch-git-generated-commit.txt

run_tests.sh

@@ -40,6 +40,8 @@ download_files test-source-rpms \
                 broken-noarch-subpackage/x86_64/test-noarch-check-1-1.fc42.x86_64.rpm \
                 broken-noarch-subpackage/x86_64/test-noarch-check-noarch-1-1.fc42.noarch.rpm
 
+download_files test-git-repos git-repos/rpmbuild-pipeline-git.tar.gz
+
 coverage=( --cov-report term-missing --cov python_scripts )
 for arg; do
     case $arg in

tests/patch-git-example-output.txt

@@ -0,0 +1,43 @@
+commit c8d343a3ff7f6be17ff1d0dd7f89d06845c0a18b
+Author:     Pavel Raiskup <praiskup@redhat.com>
+AuthorDate: Thu Mar 6 18:43:42 2025 +0100
+Commit:     Pavel Raiskup <praiskup@redhat.com>
+CommitDate: Thu Mar 6 19:23:04 2025 +0100
+
+    Correct Tekton path
+
+:000000 100644 0000000 2bca131 A	.tekton/environment-pull-request.yaml
+:000000 100644 0000000 0397e8d A	.tekton/environment-push.yaml
+:100644 000000 2bca131 0000000 D	environment-pull-request.yaml
+:100644 000000 0397e8d 0000000 D	environment-push.yaml
+
+commit 8c78e9e9c32492c00a75b31a281c57cc69e42f66
+Author:     Pavel Raiskup <praiskup@redhat.com>
+AuthorDate: Thu Mar 6 14:15:36 2025 +0100
+Commit:     Pavel Raiskup <praiskup@redhat.com>
+CommitDate: Thu Mar 6 14:24:17 2025 +0100
+
+    Tektonize
+
+:000000 100644 0000000 2bca131 A	environment-pull-request.yaml
+:000000 100644 0000000 0397e8d A	environment-push.yaml
+
+commit e0ea9d05f330a91bb1a5f60005bfae30a4b18df0
+Author:     Pavel Raiskup <praiskup@redhat.com>
+AuthorDate: Tue Mar 4 12:47:00 2025 +0100
+Commit:     Pavel Raiskup <praiskup@redhat.com>
+CommitDate: Tue Mar 4 12:47:00 2025 +0100
+
+    Fully-qualified image reference
+
+:100644 100644 e4c5edd dfea447 M	Containerfile
+
+commit 1fca25484f458311cb64536cec315e62f275cdc1
+Author:     Pavel Raiskup <praiskup@redhat.com>
+AuthorDate: Tue Mar 4 12:40:07 2025 +0100
+Commit:     Pavel Raiskup <praiskup@redhat.com>
+CommitDate: Tue Mar 4 12:44:25 2025 +0100
+
+    Initial commit
+
+:000000 100644 0000000 e4c5edd A	Containerfile

tests/test_patch_git_preparation.py

@@ -0,0 +1,53 @@
+"""
+Test patch-git-prepare.sh script
+"""
+
+import os
+import subprocess
+import tempfile
+from pathlib import Path
+
+
+def test_patch_git_prep():
+    """
+    Just run the script against our repo, and compare with the expected output.
+    """
+
+    root_dir = Path(__file__).parent.parent.absolute()
+    script_path = root_dir / "patch-git-prepare.sh"
+    expected_file = root_dir / "tests" / "patch-git-example-output.txt"
+    repos_dir = root_dir / "test-git-repos" / "git-repos"
+    repo_tarball = repos_dir / "rpmbuild-pipeline-git.tar.gz"
+
+    # Extract the test repository into the temporary directory
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        workdir = Path(tmp_dir)
+
+        subprocess.run(
+            ["tar", "-xzf", str(repo_tarball), "-C", str(workdir)],
+            check=True
+        )
+
+        git_dir = workdir / "rpmbuild-pipeline-git"
+        env = os.environ.copy()
+        env["GIT_CONFIG_COUNT"] = "1"
+        env["GIT_CONFIG_KEY_0"] = "safe.directory"
+        env["GIT_CONFIG_VALUE_0"] = str(git_dir)
+
+        r = subprocess.run(
+            [str(script_path)],
+            capture_output=True,
+            text=True,
+            check=False,
+            cwd=git_dir,
+            env=env,
+        )
+
+        if r.returncode:
+            raise RuntimeError(f"Command errored: {r.stderr}")
+
+        generated_file = git_dir / "patch-git-generated-log.txt"
+        actual_content = generated_file.read_text()
+        expected_content = expected_file.read_text()
+
+        assert actual_content == expected_content