From afabaf695a71c22101c968348145608a0f72bb9e Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Fri, 8 Mar 2024 18:06:16 +1100 Subject: [PATCH] split out sme12 and base on el9 --- koji-setup/koji-bootstrap-build.sh | 159 ++++++++++++++++++++--------- 1 file changed, 109 insertions(+), 50 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index b50fcf4..5e6e97e 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -124,12 +124,12 @@ for REPO in addons updates updates-testing testing ; do sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" done -# Releases sme11 and sme12 are based on Rocky 8 (EL8) +# Release sme11 is based on Rocky 8 (EL8) +RELEASE="11" EL="8" DIST=".el$EL.sme" PKGMANAGER="dnf" BOOTSTRAPIMAGE="rockylinux:$EL" -#CHROOTSETUPCMD=' install 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-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/ @@ -140,53 +140,112 @@ sudo -u kojiadmin koji add-external-repo epel$EL https://muug.ca/mirror/fedora-e # mirrorList=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$EL&arch=\$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/ -for RELEASE in 11 12 ; do # 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 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-target dist-"$TAG" dist-"$TAG"-build - sudo -u kojiadmin koji add-group dist-"$TAG"-build build - sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build - sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" -# sudo -u kojiadmin koji edit-tag -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" dist-"$TAG" - sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG" - sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG" - sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" dist-"$TAG" - sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG" - sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build 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-pkg dist-"$TAG"-build srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL - sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait -# Only build for smeos and smecontribs - others are staging - TAG="sme$RELEASE-contribs" - sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" - sudo -u kojiadmin koji add-tag --parent dist-$TAG --arches="$RPM_ARCH" dist-$TAG-build - sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build - sudo -u kojiadmin koji add-tag-inheritance dist-$TAG-build dist-sme$RELEASE-os --priority 10 - sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE" -# sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.chroot_setup_cmd="$CHROOTSETUPCMD" - sudo -u kojiadmin koji add-group dist-"$TAG"-build build - sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build - sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build 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-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio elfutils file grep gzip make pigz rpm sed tar unzip wget xz - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL - sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL - sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait +DISTRIBUTION="SME Server v$RELEASE" +TAG="sme$RELEASE-os" +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 add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"$TAG"-build +sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build +sudo -u kojiadmin koji add-group dist-"$TAG"-build build +sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build +sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG" +sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build 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-pkg dist-"$TAG"-build srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL +sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait +# Only need build for smeos and smecontribs - others are staging +TAG="sme$RELEASE-contribs" +sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" +sudo -u kojiadmin koji add-tag --parent dist-$TAG --arches="$RPM_ARCH" dist-$TAG-build +sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build +sudo -u kojiadmin koji add-tag-inheritance dist-$TAG-build dist-sme$RELEASE-os --priority 10 +sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE" +sudo -u kojiadmin koji add-group dist-"$TAG"-build build +sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build +sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build 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-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio elfutils file grep gzip make pigz rpm sed tar unzip wget xz +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL +sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait # setup the rest of the repos - for REPO in addons updates updates-testing testing ; do - TAG="sme$RELEASE-$REPO" - sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" - done -done +for REPO in addons updates updates-testing testing ; do + TAG="sme$RELEASE-$REPO" + sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" +done + +# Release sme12 is based on Rocky 9 (EL9) +RELEASE="12" +EL="9" +DIST=".el$EL.sme" +PKGMANAGER="dnf" +BOOTSTRAPIMAGE="rockylinux:$EL" +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/ +# mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=\$arch&repo=AppStream-$EL +sudo -u kojiadmin koji add-external-repo powertools$EL https://dl.rockylinux.org/pub/rocky/$EL/PowerTools/\$arch/os/ +# mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=\$arch&repo=PowerTools-$EL +sudo -u kojiadmin koji add-external-repo epel$EL https://muug.ca/mirror/fedora-epel/$EL/Everything/\$arch/ +# mirrorList=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$EL&arch=\$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/ +# 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 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-target dist-"$TAG" dist-"$TAG"-build +sudo -u kojiadmin koji add-group dist-"$TAG"-build build +sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build +sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" dist-"$TAG" +sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG" +sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build 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-pkg dist-"$TAG"-build srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL +sudo -u kojiadmin koji regen-repo dist-"$TAG"-build --nowait +# Only need build for smeos and smecontribs - others are staging +TAG="sme$RELEASE-contribs" +sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" +sudo -u kojiadmin koji add-tag --parent dist-$TAG --arches="$RPM_ARCH" dist-$TAG-build +sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build +sudo -u kojiadmin koji add-tag-inheritance dist-$TAG-build dist-sme$RELEASE-os --priority 10 +sudo -u kojiadmin koji edit-tag dist-"$TAG" -x mock.bootstrap_image="$BOOTSTRAPIMAGE" +sudo -u kojiadmin koji add-group dist-"$TAG"-build build +sudo -u kojiadmin koji add-group dist-"$TAG"-build srpm-build +sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build 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-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio elfutils file grep gzip make pigz rpm sed tar unzip wget xz +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare os$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare appstream$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare powertools$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare epel$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare openfusion$EL +sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build -m bare rpmfusion$EL +sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait +# setup the rest of the repos +for REPO in addons updates updates-testing testing ; do + TAG="sme$RELEASE-$REPO" + sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-os dist-"$TAG" +done