Signed-off-by: Adam Williamson awilliam@redhat.com
Generated from https://pagure.io/fedora-project-config/pull-request/351 .
Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/a4aa13a779c04782ac15b20e5f2befe8
It seems you run it on an older branch?
I don't know why that changed. Let me see if I can re-gen.
rebased onto fb9d82541639667f353c0b653966be66bdaacea5
Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/f7a92e66c4774beea72d73d7c45bf060
So, I re-genned, making sure everything was on current master first, and it still takes those lines out.
I don't actually get what's going on with that 'cleanup' thing though. It was added in https://pagure.io/fedora-zuul-jobs-config/c/fb9d82541639667f353c0b653966be66bdaacea5?branch=master , but I don't see any equivalent to that in fedora-project-config . There's no equivalent commit that adds anything to do with 'cleanup' there. The string 'cleanup' doesn't appear in fedora-project-config . So I don't understand what's going on there, if this repo is always meant to be generated from fedora-project-config - changes shouldn't just be appearing in this repo, right?
It is probably an issue on my side and I missed a dhall change that should have been done. I'm jumping in to check
Good news, I found the dhall spot that I have missed, bad news the following does not work
dhall
let common_koji_rpm_build = Zuul.Job::{ , name = "${job-prefix}common-koji-rpm-build" , abstract = Some True , protected = Some True , description = Some "Base job for RPM build on Fedora Koji" , timeout = Some 21600 , nodeset = Some default_nodeset , roles = Some [ { zuul = "zuul-distro-jobs" } ] , run = Some "playbooks/koji/build-ng.yaml" + , post-run = Some [ { name = "playbooks/koji/cleanup.yaml", cleanup = true } ] , secrets = Some [ Zuul.Job.Secret::{ name = "krb_keytab", secret = "krb_keytab" } ] }
It seems we need to teach dhall-zuul (https://softwarefactory-project.io/cgit/software-factory/dhall-zuul/plain/package.dhall) how to treat cleanup keyword
dhall-zuul
So do you want me to just put the lines back in this PR manually for now?
Hmm, yeah, probably that's the best approach at this time
Done.
Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/e889d369d9044d8f83e86ef92199568b
Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/cdfd5ba33356435aabcd8d5c7c9a1c0c
Can you touch up the
- post-run: - - name: playbooks/koji/cleanup.yaml - cleanup: true
again?
Can you touch up the - post-run: - - name: playbooks/koji/cleanup.yaml - cleanup: true again?
@adamwill ping about :point_up: (reverting that change)? I tried to touch it up myself but didn't have the permissions to. Other than that can merge it
oh, right, yeah. will do.
OK, rebased and put that bit back. Along with the other two, this now also removes F41 as it's EOL.
Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/79c8d0137584437c9379a564f9518ea0
Complicated Diff, but LGTM
Metadata Update from @fbo: - Pull-request tagged with: gateit
Build succeeded (gate pipeline). https://fedora.softwarefactory-project.io/zuul/buildset/f9994c6939c94c738d0efd98230add25
Pull-Request has been merged by zuul
Signed-off-by: Adam Williamson awilliam@redhat.com