Refactor COPR jobs for easier branching #376
Conversation
ekohl
force-pushed
the
correct-branching
branch
from
3b59c2a
to
dd0184d
Compare
ekohl
force-pushed
the
correct-branching
branch
3 times, most recently
from
1b473a8
to
f4ee103
Compare
|
Right now the Copr PR test is locked to |
| @@ -0,0 +1 @@ | |||
| [] | |||
There was a problem hiding this comment.
This won't play well the first time, but if I left it empty then it failed to build. It'll easily show up in review if you add a line after this.
| @@ -4,4 +4,3 @@ | |||
| - '3.21' | |||
| - '3.22' | |||
| - '3.28' | |||
| - 'nightly' | |||
There was a problem hiding this comment.
AFAIK we don't build Pulp nightly in Koji anymore, so this can be cleaned up.
Looking at the source, this is tricky in trying to reuse the other configs. |
Yes... I think I would have to combine the jobs into a single job with |
|
I'm tempted to go the easy route on the triggers. |
| @@ -21,6 +21,8 @@ sed -i "/nightly/i \ \ \ \ \ \ - '${KATELLO_VERSION}'" centos.org/jobs/katello-p | |||
|
|
|||
| echo "- '${FOREMAN_VERSION}'" >> theforeman.org/yaml/includes/foreman_versions.yaml.inc | |||
There was a problem hiding this comment.
if we're not doing koji releases anymore, can't this go?
(also, the file is now foreman_versions_koji, right?)
There was a problem hiding this comment.
No, this is the file with all releases. It's also used for Debian and other stuff like smart-proxy-X.Y-stable-test & test_X_Y_stable.
This uses the same approach as for Koji, but also makes it explicit which is which. It drops the pulpcore nightly koji job.
This introduces a completely reusable
foreman-packaging-{packaging_label}-{version}-release job template. Then
it instantiates the various versions of it.
The design is currently that it creates both koji and copr for nightly,
but only a single rpm instance for releases.
The branch-foreman script is modified to do the right thing.
ekohl
force-pushed
the
correct-branching
branch
from
f4ee103
to
42ff27b
Compare
|
I think this covers it by introducing new GHPRB triggers with regexes. Not pretty, but I'd expect it to work. On a related note: we should really get away from GHPRB since it's unmaintained and has security problems. |
| @@ -0,0 +1 @@ | |||
| - 'nightly' | |||
There was a problem hiding this comment.
We can include '3.39' here as well, since we are going to branch from rpm/develop
There was a problem hiding this comment.
I think that's out of scope for this PR: we should treat 3.39 as a separate branching step. We already know https://github.com/theforeman/theforeman-rel-eng/blob/master/procedures/pulpcore/update.md.erb is out of date, so please keep notes when you do.
See individual commits for details. The goal is to use include files to create the right jobs so there is only a single one. For Foreman this is a bit uglier because it's more complex.