fedpkg, not rhpkg, is used when on custom git branches

[tserlin]

I ran into a subtle error when running the "tar-changes" script for a ceph testfix.

If you're not on a regular ceph branch (e.g.: ceph-4.0-rhel-8), and using a testfix branch (e.g.: private-tserlin-ceph-4.0-rhel-8-*), the script assumes you want "fedpkg" and not "rhpkg":

https://github.com/ktdreyer/rdopkg-tar/blob/master/tar-changes#L157

When running it on RHEL 7, the "fedpkg upload" part failed because even though I did have fedpkg installed, it was trying to use a non-existent git option: git remote get-url.
Fedora's git has this option, but RHEL 7's git doesn't.

That said, the "tar-changes" did finish, and did create a dist-git commit OK, but it did not upload the *-changes tarball, nor did it update the "sources" file.

If you have an unconventional branch name, then the "osdist" function in rdopkg/guess.py will return "RDO".

[tserlin]

I created a separate branch as a workaround:

https://github.com/ktdreyer/rdopkg-tar/tree/private-tserlin-rhpkg-issue-4

[ktdreyer]

Looking at the definition for osdist() upstream, I think that we want to drop the "private-foo-" suffix before the branch name, like re.sub(r'^private-[^-]+-'). What do you think @tserlin? Would that regex match all the branches that you use?

Looks like there's no test coverage for rdopkg.guess.osdist() upstream in test_guess.py, so we should write a bunch of branch names to exercise all the cases we expect to use.

[tserlin]

Yes, "private-tserlin-" is pretty much what I only use for testfixes and hotfixes.

[ktdreyer]

I've refactored the rdopkg guess.py tests, added tests for osdist(), and added this feature.

https://softwarefactory-project.io/r/#/q/status:open+project:rdopkg+branch:master+topic:guess-improvements

[ktdreyer]

I've asked in #rdo (freenode) for someone to merge my changes above.

In the meantime, let's merge your changes that avoid guess.osdist() and guess.new_sources().

[ktdreyer]

The fix is in rdopkg's master branch now, https://softwarefactory-project.io/r/18391

We need a new rdopkg release. I've requested this at softwarefactory-project/rdopkg#186 and the rdo dev list.

[ktdreyer]

rdopkg 1.3.0 is in updates-testing for Fedora 33 and epel-testing for epel 8: https://bodhi.fedoraproject.org/updates/?search=rdopkg

[ktdreyer]

rdopkg 1.3.0 is in Fedora and EPEL 8. I think that means that we can close this.