#751 Simplify the new release branching process
Merged by siosm. Opened by gordonmessmer.
gordonmessmer/workstation-ostree-config main  into  main

Download 751.patch

I've looked over https://pagure.io/pungi/blob/master/f/pungi/ostree/utils.py#_68 and as far as I can tell, pungi isn't sensitive to the repo names in the source tree.

Is there a documented process to use pungi to compose an ostree repo locally, so that I can test this change?

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/34c25633285241389b7aa0def614bc96

rebased onto 8d7bb4c552623cfd627a4ae4dd80a6eba5d98ea1

I checked in with https://matrix.to/#/#releng:fedoraproject.org and there doesn't seem to be a really good way to test this change outside of prod. :(

(I've added a recipe to handle the branching process so that it doesn't need to be copy/paste out of README, which also removes a couple of steps.)

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/852d1aadb12142a4891dd3a7170aba81

Looking good. Let's tweak a few things:
- Let's move all repos (rawhide included) into a single fedora.repo file so that we don't have to touch it anymore
- Let's update the justfile to figure out the version by itself for branching

I'll resume the review ASAP.

The justfile recipe should start with the bash shebang and set -euo pipefail like the others.

1 new commit added

  • More simpler

2 new commits added

  • More simpler
  • Simplify the new release branching process

Updated, thanks!

Looking good. You should be able to read the version from the manifest with:

version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')"

It's already used in other just recipes.

This way we don't even need to carry and update the version in the justfile.

2 new commits added

  • More simpler
  • Simplify the new release branching process

Sounds good. I thought there was a reason I wanted to keep the option to specify a branch, but now I can't think of one.

2 new commits added

  • More simpler
  • Simplify the new release branching process

2 new commits added

  • More simpler
  • Simplify the new release branching process

rebased onto ea8ac984c86d9989467d43570f2fcd2ebdc5f3a0

Looking good, thanks.

Pull-Request has been merged by siosm

We have successful composes for Rawhide so it looks like all is good here. It is not strictly needed but if you want you can backport this to F44.

I'd be happy to do that.

Do you want a full re-sync as a single commit? Or something more narrowly scoped?

https://pagure.io/workstation-ostree-config/pull-request/753 looks good.

Looks like this broke the rawhide tagging for container builds at https://gitlab.com/fedora/ostree/ci-test. I'll clean that up.

Metadata