#1267 f39: fix container-nightly.sh script to sync the right thing
Merged 10 months ago by jnsamyak. Opened 10 months ago by kevin.
kevin/pungi-fedora sync-fix  into  f39

file modified
+1 -1
@@ -73,7 +73,7 @@ 

  # Push 39 ostree base container image to fedora registry

  pushd ./releng

  pushd ./scripts

- ./sync-ostree-base-containers.sh $RELEASE

+ ./sync-latest-container-base-image.sh $RELEASE

  popd

  popd

  

We want to sync the base container images here
(container/container-minimal/toolbox), not the ostree ones (silverblue,
etc).

Signed-off-by: Kevin Fenzi kevin@scrye.com

This looks right to me. sync-ostree-base-containers is for converting atomic desktop ostrees to container images, and publishing those, so it should run after composes that build those. sync-latest-container-base-image.sh should be the right thing to run after building the things that container-nightly.sh / fedora-container.conf build.

Note this problem exists on f40 and main branches, too. We don't actually run the script on those branches yet, but we should fix it there too for when we will.

I'm not sure we actually should be running sync-ostree-base-containers in its current form at all any more, but @walters could maybe advise. We now build proper OCI images for Silverblue, Kinoite and Sericea at least - which are the three variants that script can convert from ostrees - in the current dev releases (40 and Rawhide). If anything, we should be publishing those, not publishing images built by converting ostrees?

But maybe I'm misunderstanding something there.

Note that for f40/rawhide we do these as part of the main nightly.sh, it's only 'stable' releases that we build those nightly.

yes, but once f40 goes stable, we will "naturally" just start doing container-nightly.sh on it instead, and if we don't fix this for that branch now, this problem will show up there when that happens. as for main, well, all the release branches fork off it at first, so we should fix it there too so f41, f42 etc. don't inherit the problem.

as for the 'should we be doing sync-ostree-base-containers at all?" thing, we seem to be tracking that at https://pagure.io/releng/issue/10399 , thanks @siosm for pointing me there.

This looks like Lgtm for f39 and we can merge this, but do we have to do this for f40?
Because, as @adamwill mentioned we will be doing it with container-nightly.sh f40+ onwards,?

well, we should go ahead and merge it for f39 at least, I guess...

Pull-Request has been merged by jnsamyak

10 months ago

I thought I merged it in the afternoon but I guess I did not! I'll discuss more about this in our releng call today :D for f40+

Yeah... if someone wants to do a f40 pr to change that, we could, or we could wait for the discussion above. ;)

+1 to merge this now.

I don't fully know / understand if it's related to this change yet but about 16 days ago, https://quay.io/repository/fedora/fedora-silverblue?tab=tags stopped being updated, right around when this change got merged.

See also: https://discussion.fedoraproject.org/t/quay-io-fedora-fedora-silverblue-39-not-updated/112593

Yep. It did. :( we forgot oci images...

We need to enhance the script bodhi uses to sync ostree commits for updates probibly to also generate/push the oci images. ;(

In the mean time I will manually do a sync now...

OK, maybe let's focus on https://pagure.io/releng/issue/10399 instead of investing time into fixing the sync script as ideally it will go away soon.

Metadata