From 4409a8d97d7ea188212fd4b326556b874898691f Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Sun, 29 Sep 2024 20:22:50 +1000
Subject: [PATCH] update all sme11 and sme12 tags

---
 koji-setup/koji-bootstrap-build.sh | 129 +++++++++++++++++++----------
 1 file changed, 86 insertions(+), 43 deletions(-)

diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh
index 0ab7d9c..74d9670 100755
--- a/koji-setup/koji-bootstrap-build.sh
+++ b/koji-setup/koji-bootstrap-build.sh
@@ -116,15 +116,14 @@ sudo -u kojiadmin koji add-target $RELEASE-test "$BUILDTAG" "dist-$RELEASE-testi
 sudo -u kojiadmin koji add-target $RELEASE-contribs-test "$BUILDTAG" "dist-$RELEASE-contribs-testing"
 
 # Release sme11 is based on Rocky 8 (EL8)
-RELEASE="sme11"
+RELEASE="11"
 DISTRIBUTION="SME Server v$RELEASE"
-TAG="dist-$RELEASE-os"
-PARENT="$TAG"
 EL="8"
 DIST=".el$EL.sme"
 PKGMANAGER="dnf"
 BOOTSTRAPIMAGE="rockylinux:$EL"
-sudo -u kojiadmin koji add-external-repo $RELEASE http://koji.koozali.org/kojifiles/repos-dist/$TAG/latest/\$arch/
+# setup the external repositories referenced in builds
+sudo -u kojiadmin koji add-external-repo smeserver$RELEASE http://koji.koozali.org/kojifiles/repos-dist/$TAG/latest/\$arch/
 sudo -u kojiadmin koji add-external-repo os$EL https://dl.rockylinux.org/pub/rocky/$EL/BaseOS/\$arch/os/
 # mirrorList=http://mirrors.rockylinux.org/mirrorlist?release=$EL&arch=\$arch&repo=BaseOS-$EL
 sudo -u kojiadmin koji add-external-repo appstream$EL https://dl.rockylinux.org/pub/rocky/$EL/AppStream/\$arch/os/
@@ -138,7 +137,9 @@ sudo -u kojiadmin koji add-external-repo rpmfusion$EL http://download1.rpmfusion
 sudo -u kojiadmin koji add-external-repo remi$EL http://rpms.remirepo.net/enterprise/$EL/remi/\$arch/    
 sudo -u kojiadmin koji add-external-repo remi-modular$EL http://rpms.remirepo.net/enterprise/$EL/modular/\$arch/    
 sudo -u kojiadmin koji add-external-repo remi-safe$EL http://rpms.remirepo.net/enterprise/$EL/safe/\$arch/    
-# Setup the os repo - parent of others who will inherit most properties
+# Setup the os repo - parent of build and testing who will inherit most properties
+TAG="smeserver$RELEASE"
+PARENT="$TAG"
 sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" "$PARENT"
 sudo -u kojiadmin koji edit-tag -x mock.package_manager="$PKGMANAGER" "$PARENT"
 sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" "$PARENT"
@@ -146,8 +147,8 @@ sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" "$PARE
 sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" "$PARENT"
 sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" "$PARENT"
 sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" "$PARENT"
-# add build tag for all $RELEASE targets
-BUILDTAG="dist-$RELEASE-build"
+# add build tag for smeseserver$RELEASE targets
+BUILDTAG="smeserver$RELEASE-build"
 sudo -u kojiadmin koji add-tag --parent "$PARENT" --arches="$RPM_ARCH" "$BUILDTAG"
 sudo -u kojiadmin koji add-group "$BUILDTAG" build
 sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
@@ -155,36 +156,54 @@ sudo -u kojiadmin koji add-group "$BUILDTAG" srpm-build
 sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz
 sudo -u kojiadmin koji add-group "$BUILDTAG" livemedia-build
 sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" livemedia-build anaconda bash coreutils dracut-live glibc-all-langpacks lorax-lmc-nonvirt python3-kickstart python3-pycdio selinuc-policy-targeted shadow-utils util-linux
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare $RELEASE
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare os$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare remi-safe$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare remi-modular$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare appstream$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare powertools$EL 
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare epel$EL 
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare openfusion$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare rpmfusion$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare remi$EL
-sudo -u kojiadmin koji regen-repo "$BUILDTAG" --nowait
-# setup the rest of the repos - all inherit values from os
-for REPO in contribs contribs-testing addons updates updates-testing testing ; do
-    TAG="dist-$RELEASE-$REPO"
-    sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG"
+for each repo in os$EL remi-safe$EL remi-modular$EL appstream$EL powertools$EL epel$EL openfusion$EL rpmfusion$EL remi$EL ; do
+	sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare $repo
 done
-# set up the smeserver and smecontribs targets
-sudo -u kojiadmin koji add-target $RELEASE-test "$BUILDTAG" "dist-$RELEASE-testing"
-sudo -u kojiadmin koji add-target $RELEASE-contribs-test "$BUILDTAG" "dist-$RELEASE-contribs-testing"
+sudo -u kojiadmin koji regen-repo "$BUILDTAG" --nowait
+# setup the testing repo - inherit values from os
+TAG="smeserver$RELEASE-testing"
+sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG"
+# set up the smeserver targets
+sudo -u kojiadmin koji add-target smeserver$RELEASE "$BUILDTAG" "smeserver$RELEASE-testing"
+
+# Setup the contribs repo - parent of build and testing who will inherit most properties
+TAG="smecontribs$RELEASE"
+PARENT="$TAG"
+sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" "$PARENT"
+sudo -u kojiadmin koji edit-tag -x mock.package_manager="$PKGMANAGER" "$PARENT"
+sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" "$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" "$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" "$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" "$PARENT"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" "$PARENT"
+# add build tag for smecontribs$RELEASE targets
+BUILDTAG="smecontribs$RELEASE-build"
+sudo -u kojiadmin koji add-tag --parent "$PARENT" --arches="$RPM_ARCH" "$BUILDTAG"
+sudo -u kojiadmin koji add-group "$BUILDTAG" build
+sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
+sudo -u kojiadmin koji add-group "$BUILDTAG" srpm-build
+sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz
+sudo -u kojiadmin koji add-group "$BUILDTAG" livemedia-build
+sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" livemedia-build anaconda bash coreutils dracut-live glibc-all-langpacks lorax-lmc-nonvirt python3-kickstart python3-pycdio selinuc-policy-targeted shadow-utils util-linux
+for each repo in smeserver$RELEASE os$EL remi-safe$EL remi-modular$EL appstream$EL powertools$EL epel$EL openfusion$EL rpmfusion$EL remi$EL ; do
+	sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare $repo
+done
+sudo -u kojiadmin koji regen-repo "$BUILDTAG" --nowait
+# setup the testing repo - inherit values from os
+TAG="smecontribs$RELEASE-testing"
+sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG"
+
+# set up the smecontribs targets
+sudo -u kojiadmin koji add-target smecontribs$RELEASE "$BUILDTAG" "smecontribs$RELEASE-testing"
 
 # Release sme12 is based on Rocky 9 (EL9)
-RELEASE="sme12"
+RELEASE="12"
 DISTRIBUTION="SME Server v$RELEASE"
-TAG="dist-$RELEASE-os"
-PARENT="$TAG"
 EL="9"
 DIST=".el$EL.sme"
 PKGMANAGER="dnf"
 BOOTSTRAPIMAGE="rockylinux:$EL"
-sudo -u kojiadmin koji add-external-repo $RELEASE http://koji.koozali.org/kojifiles/repos-dist/$TAG/latest/\$arch/
+sudo -u kojiadmin koji add-external-repo smeserver$RELEASE http://koji.koozali.org/kojifiles/repos-dist/$TAG/latest/\$arch/
 sudo -u kojiadmin koji add-external-repo os$EL https://dl.rockylinux.org/pub/rocky/$EL/BaseOS/\$arch/os/
 # mirrorList=http://mirrors.rockylinux.org/mirrorlist?release=$EL&arch=\$arch&repo=BaseOS-$EL
 sudo -u kojiadmin koji add-external-repo appstream$EL https://dl.rockylinux.org/pub/rocky/$EL/AppStream/\$arch/os/
@@ -196,6 +215,8 @@ sudo -u kojiadmin koji add-external-repo epel$EL https://muug.ca/mirror/fedora-e
 sudo -u kojiadmin koji add-external-repo openfusion$EL http://repo.openfusion.net/centos$EL-\$arch/
 sudo -u kojiadmin koji add-external-repo rpmfusion$EL http://download1.rpmfusion.org/free/el/updates/$EL/\$arch/    
 # Setup the os repo - parent of others who will inherit most properties
+TAG="smeserver$RELEASE"
+PARENT="$TAG"
 sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" "$TAG"
 sudo -u kojiadmin koji edit-tag "$TAG" -x mock.package_manager="$PKGMANAGER"
 sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" "$TAG"
@@ -204,7 +225,7 @@ sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" "$TAG"
 sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" "$TAG"
 sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" "$TAG"
 # add build tag for all $RELEASE targets
-BUILDTAG="dist-$RELEASE-build"
+BUILDTAG="smeserver$RELEASE-build"
 sudo -u kojiadmin koji add-tag --parent "$PARENT" --arches="$RPM_ARCH" "$BUILDTAG"
 sudo -u kojiadmin koji add-group "$BUILDTAG" build
 sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
@@ -212,19 +233,41 @@ sudo -u kojiadmin koji add-group "$BUILDTAG" srpm-build
 sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz
 sudo -u kojiadmin koji add-group "$BUILDTAG" livemedia-build
 sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" livemedia-build anaconda bash coreutils dracut-live glibc-all-langpacks lorax-lmc-nonvirt python3-kickstart python3-pycdio selinuc-policy-targeted shadow-utils util-linux
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare $RELEASE
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare os$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare appstream$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare powertools$EL 
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare epel$EL 
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare openfusion$EL
-sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare rpmfusion$EL
+for each repo in os$EL appstream$EL epel$EL openfusion$EL rpmfusion$EL ; do
+	sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare $repo
+done
 sudo -u kojiadmin koji regen-repo "$BUILDTAG" --nowait
 # setup the rest of the repos - all inherit values from os
-for REPO in contribs contribs-testing addons updates updates-testing testing ; do
-    TAG="dist-$RELEASE-$REPO"
-    sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG"
+TAG="smeserver$RELEASE-testing"
+sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG"
+# set up the smeserver targets
+sudo -u kojiadmin koji add-target smeserver$RELEASE "$BUILDTAG" "smeserver$RELEASE-testing"
+
+# Setup the contribs repo - parent of others who will inherit most properties
+TAG="smecontribs$RELEASE"
+PARENT="$TAG"
+sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" "$TAG"
+sudo -u kojiadmin koji edit-tag "$TAG" -x mock.package_manager="$PKGMANAGER"
+sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" "$TAG"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" "$TAG"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" "$TAG"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" "$TAG"
+sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" "$TAG"
+# add build tag for all $RELEASE targets
+BUILDTAG="smecontribs$RELEASE-build"
+sudo -u kojiadmin koji add-tag --parent "$PARENT" --arches="$RPM_ARCH" "$BUILDTAG"
+sudo -u kojiadmin koji add-group "$BUILDTAG" build
+sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" build epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which yum-utils xz
+sudo -u kojiadmin koji add-group "$BUILDTAG" srpm-build
+sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz
+sudo -u kojiadmin koji add-group "$BUILDTAG" livemedia-build
+sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" livemedia-build anaconda bash coreutils dracut-live glibc-all-langpacks lorax-lmc-nonvirt python3-kickstart python3-pycdio selinuc-policy-targeted shadow-utils util-linux
+for each repo in smeserver$RELEASE os$EL appstream$EL epel$EL openfusion$EL rpmfusion$EL ; do
+	sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" -m bare $repo
 done
-# set up the smeserver and smecontribs targets
-sudo -u kojiadmin koji add-target $RELEASE-test "$BUILDTAG" "dist-$RELEASE-testing"
-sudo -u kojiadmin koji add-target $RELEASE-contribs-test "$BUILDTAG" "dist-$RELEASE-contribs-testing"
+sudo -u kojiadmin koji regen-repo "$BUILDTAG" --nowait
+# setup the rest of the repos - all inherit values from os
+TAG="smecontribs$RELEASE-testing"
+sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG"
+# set up the smecontribs targets
+sudo -u kojiadmin koji add-target smecontribs$RELEASE "$BUILDTAG" "smecontribs$RELEASE-testing"