From 73872d0950c951815ec67d56b6ebf78e690cc308 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Oct 14 2020 14:03:41 +0000
Subject: Create container tag and bodhi release for rawhide at branching


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/docs/source/sop_mass_branching.rst b/docs/source/sop_mass_branching.rst
index 19694f0..27d18e9 100644
--- a/docs/source/sop_mass_branching.rst
+++ b/docs/source/sop_mass_branching.rst
@@ -960,7 +960,13 @@ To create a rawhide release in bodhi, you need to run
 
     $ bodhi releases create --name "F32" --long-name "Fedora 32" --id-prefix FEDORA --version 32 --branch f32 --dist-tag f32 --stable-tag f32 --testing-tag f32-updates-testing --candidate-tag f32-updates-candidate --pending-stable-tag f32-updates-pending --pending-testing-tag f32-updates-testing-pending --pending-signing-tag f32-signing-pending --state pending --override-tag f32-override --create-automatic-updates --not-composed-by-bodhi
 
-To create a flatpak release in bodhi, you need to run
+To create a container release for rawhide in bodhi, you need to run
+
+::
+
+    $ bodhi releases create --name "F34C" --long-name "Fedora 34 Containers" --id-prefix FEDORA-CONTAINER --version 34 --branch f34 --dist-tag f34-container --stable-tag f34-container-updates --testing-tag f34-container-updates-testing --candidate-tag f34-container-updates-candidate --pending-stable-tag f34-container-updates-pending --pending-testing-tag f34-container-updates-testing-pending --state pending --override-tag f34-container-override
+
+To create a flatpak release for branched in bodhi, you need to run
 
 ::
 
diff --git a/scripts/branching/make-koji-release-tags b/scripts/branching/make-koji-release-tags
index 04aab6e..5647212 100755
--- a/scripts/branching/make-koji-release-tags
+++ b/scripts/branching/make-koji-release-tags
@@ -101,12 +101,21 @@ koji add-pkg --owner=releng "f${modular_release}" $pkgs
 
 "${KOJICLI}" tag-pkg "f${release}-build" "$(${KOJICLI} latest-build "f${old_release}-build" glibc64 glibc32 --quiet|sed -e "s| .*||g" )"
 
+# Set up a corresponding set of tags for containers.
+container_release=${release}-container
+"${KOJICLI}" add-tag --parent "f${container_release}" "f${container_release}-updates"
+"${KOJICLI}" add-tag --parent "f${container_release}-updates" "f${container_release}-updates-candidate"
+"${KOJICLI}" add-tag --parent "f${container_release}-updates" "f${container_release}-updates-testing"
+"${KOJICLI}" add-tag --parent "f${container_release}-updates-testing" "f${container_release}-updates-testing-pending"
+"${KOJICLI}" add-tag --parent "f${container_release}-updates" "f${container_release}-updates-pending"
+"${KOJICLI}" add-tag --parent "f${container_release}-updates" "f${container_release}-override"
+
 "${KOJICLI}" add-target "f${release}" "f${release}-build" "f${release}-updates-candidate"
 "${KOJICLI}" add-target "f${release}-candidate" "f${release}-build" "f${release}-updates-candidate"
 "${KOJICLI}" add-target "f${release}-infra" "f${release}-infra-build" "f${release}-infra-candidate"
-"${KOJICLI}" add-target "f${release}-container-candidate" "f${release}-container-build" "f${release}-container"
+"${KOJICLI}" add-target "f${release}-container-candidate" "f${release}-container-build" "f${release}-container-updates-candidate"
 "${KOJICLI}" edit-target rawhide --dest-tag="f${release}-updates-candidate" --build-tag="f${release}-build"
-"${KOJICLI}" edit-target rawhide-container-candidate --dest-tag="f${release}-container" --build-tag="f${release}-container-build"
+"${KOJICLI}" edit-target rawhide-container-candidate --dest-tag="f${release}-container-updates-candidate" --build-tag="f${release}-container-build"
 
 
 "${KOJICLI}" remove-tag-inheritance rawhide "f${old_release}"