From 54ee429f5c9aed45c22c6d62dd6563801eb2d88d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Apr 29 2024 19:08:37 +0000
Subject: Have container-nightly.sh publish all container images


What container-nightly.sh does to publish container images is
currently inconsistent across branches. #1267 made it publish
only the regular container images (the ones it actually builds)
on the f39 branch. On f40 and main branches, it currently would
not publish the images it builds at all, it instead only
runs sync-ostree-base-containers.sh , which converts the ostrees
for some of the atomic desktops to OCI images and publishes
those (which is also what it used to do on the f39 branch).

We should make the behavior consistent across all branches. The
script is never actually run on the 'main' branch, but new
releases branch off 'main' so we should keep it in line with
our intentions.

Overall at present, I think the most sensible thing to do is
have this script run both sync scripts.

The Fedora-Container compose does not build atomic desktop stuff
at all; Bodhi does that. But Bodhi does not have any ability to
convert the ostrees it builds to OCI images, natively produce
OCI images, or publish OCI images to registries. So if we don't
have something else do that, we will never publish updated OCI
images for atomic desktops for stable releases. Since we ought
to run the script *somewhere*, doing it here seems as good as
anywhere.

Longer term we need to make various improvements to this whole
process, but for now this seems the pragmatic thing to do.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/container-nightly.sh b/container-nightly.sh
index bb234df..7b4994f 100755
--- a/container-nightly.sh
+++ b/container-nightly.sh
@@ -77,9 +77,12 @@ SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
 #         mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
 #done
 
-# Push rawhide ostree base container image to fedora registry
 pushd ./releng
 pushd ./scripts
+# Publish OCI container images we just built to Fedora and Quay registries
+./sync-latest-container-base-image.sh $RELEASE
+# Also convert latest Atomic Desktop ostrees to OCIs and publish those, even
+# though this script does not build them (because Bodhi cannot do this itself)
 ./sync-ostree-base-containers.sh $RELEASE
 popd
 popd