dist-git - avoid the downstream-only hacks we are using for autospec

[fedora-copr-github-bot]

There are now two problems to fix:

• spec_file_processed_by_rpmautospec check needs to be disabled for copr dist git deployments
• the --allow-empty option shouldn't be used while importing SRPMs and unskip test_no_op_1 (see dist-git: FTBFS with python-rpkg > 1.65 #2600)

---

Original issue: https://pagure.io/copr/copr/issue/2317
Opened: 2022-09-22 13:23:01
Opened by: praiskup

We need a way around this (a new opt-out in rpkg, I guess, and proper configuration in copr-dist-git or dist-git):
https://pagure.io/rpkg/c/3087dd72e933568896b2f167bab75194482a6cd1

The reason is that in Copr we want to import the pre-generated SRPMs into our "proxy" DistGit instance. This way we keep the changelog and Release info baked into the Fedora DistGit "git log".

---

praiskup commented at 2022-09-22 23:03:11:

For now, we can apply this patch (ansible patching), and things should be fine...

--- /usr/lib/python3.10/site-packages/pyrpkg/utils.py   2022-09-06 20:05:35.000000000 +0000            [===                                                                                               ] ---  B/s |   0  B     --:-- ETA
+++ /usr/lib/python3.10/site-packages/pyrpkg/utils.py   2022-09-22 19:08:16.328405267 +0000
@@ -323,6 +323,7 @@
 
 
 def spec_file_processed_by_rpmautospec(file_name, dir_path=None):
+    return False
     file_path = os.path.join(dir_path or "", file_name)
 
     try:

[nikromen]

note that this may also solve our problem https://pagure.io/rpkg/issue/641

[praiskup]

note that this may also solve our problem https://pagure.io/rpkg/issue/641

Summary from our meeting: That issue discusses possibilities of how to get the original SRPM from the generated one. That's not what we want, we'd loose the generated Release and %changelog fields that we want to keep (i.e. if Fedora DistGit has a generated Release: 2, we want to keep this release in a build from DistGit in Copr).

[praiskup]

@nikromen contacted @onosek, option is being discussed

[praiskup]

Related: #2600

[onosek]

Would that work for you?
https://pagure.io/rpkg/pull-request/679
Provided you want to use this here:

copr/dist-git/copr_dist_git/package_import.py

Line 220 in fceb794

upload_files = commands.import_srpm(srpm_path)

[praiskup]

Absolutely, thank you for the patch @onosek! We'll just need to add "BuildRequires: python3-rpkg >= X.Y" (the new option will fail with older rpkg versions). It would be nice to get the new version of rpkg into F37+.

[praiskup]

There's the second part of this issue, ie the "--allow-empty" option we need to drop from commit().

[praiskup]

We have "dnf versionlock python3-rpkg" on dist-git machines.

[nikromen]

sync:

• spec_file_processed_by_rpmautospec patch hack we have in infra ansible is resolved with this PR https://pagure.io/rpkg/pull-request/679
• I created PR in rpkg to solve the --allow-empty issue
• With rpkg 1.66-5 release it introduced new bugs so we had to skip two tests: https://github.com/fedora-copr/copr/pull/2652/files -> I created a separate issue for this. (see copr-dist-git fails to build on rawhide #2608)
• we did a versionlock for rpkg to 1.66-3 release on copr dist-git machine (prod and dev)

next steps needed to close this issue:

• wait until rpkg/pull-request/688 is merged
• wait for new rpkg release that contains these patches: rpkg/pull-request/679 and rpkg/pull-request/688
• remove the patch hack file here and remove the task here
• use the new allow_pre_generated_srpm in Commands introduced in https://pagure.io/rpkg/pull-request/679

[nikromen]

#2608 is blocking the last two steps here