minor resequencing

This commit is contained in:
Trevor Batley 2024-03-08 18:14:12 +11:00
parent afabaf695a
commit c86522a87f

View File

@ -126,6 +126,8 @@ done
# Release sme11 is based on Rocky 8 (EL8) # Release sme11 is based on Rocky 8 (EL8)
RELEASE="11" RELEASE="11"
DISTRIBUTION="SME Server v$RELEASE"
TAG="sme$RELEASE-os"
EL="8" EL="8"
DIST=".el$EL.sme" DIST=".el$EL.sme"
PKGMANAGER="dnf" PKGMANAGER="dnf"
@ -141,8 +143,6 @@ 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 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/ 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 # Setup the os repo - parent of others who will inherit most properties
DISTRIBUTION="SME Server v$RELEASE"
TAG="sme$RELEASE-os"
sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$TAG" sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$TAG"
sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager="$PKGMANAGER" sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager="$PKGMANAGER"
sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build
@ -189,6 +189,8 @@ done
# Release sme12 is based on Rocky 9 (EL9) # Release sme12 is based on Rocky 9 (EL9)
RELEASE="12" RELEASE="12"
DISTRIBUTION="SME Server v$RELEASE"
TAG="sme$RELEASE-os"
EL="9" EL="9"
DIST=".el$EL.sme" DIST=".el$EL.sme"
PKGMANAGER="dnf" PKGMANAGER="dnf"
@ -204,8 +206,6 @@ 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 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/ 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 # Setup the os repo - parent of others who will inherit most properties
DISTRIBUTION="SME Server v$RELEASE"
TAG="sme$RELEASE-os"
sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$TAG" sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$TAG"
sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager="$PKGMANAGER" sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.package_manager="$PKGMANAGER"
sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build