From 97762ff2bca370e87347fd88114c989b7ed3bad9 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Thu, 18 Jul 2024 11:51:48 +1000 Subject: [PATCH] tidy up tags --- koji-setup/koji-bootstrap-build.sh | 79 +++++++++++++++--------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index 949572f..d50549b 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -63,13 +63,13 @@ PACKAGER="Koozali.org " VENDOR="Koozali.org " # Setup sme10 for building - based on centos 7 (el7) # sme10-os is the parent - all other sme10 repos will inherit most of this... -RELEASE=10 +RELEASE="sme10" DISTRIBUTION="SME Server v$RELEASE" +TAG="$RELEASE-os" +PARENT="$TAG" DIST=".el7.sme" PKGMANAGER="yum" BOOTSTRAPIMAGE="centos:7" -CHROOTSETUPCMD=' install @buildsys-build @buildsys scl-utils-build python27-build rpm-build ' -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 edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" @@ -78,48 +78,49 @@ sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-" 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 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 install scl-utils-build python27-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 curl-bin elfutils file git git-lfs glibc-utils grep gzip make pigz plzip rpm sed shadow tar unzip wget xz -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build os http://buildsys.koozali.org/build/7/os/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build updates http://buildsys.koozali.org/build/7/updates/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build smeos http://buildsys.koozali.org/build/10/smeos/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build smeupdates http://buildsys.koozali.org/build/10/smeupdates/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build fastrack http://buildsys.koozali.org/build/7/fastrack/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build opt1 http://buildsys.koozali.org/build/7/opt1/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build opt2 http://buildsys.koozali.org/build/7/opt2/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build opt3 http://buildsys.koozali.org/build/7/opt3/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build epel http://download.fedoraproject.org/pub/epel/7/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build openfusion http://repo.openfusion.net/centos7-\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build rpmfusion http://download1.rpmfusion.org/free/el/updates/7/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build sclo-sclo http://mirror.centos.org/centos/7/sclo/\$arch/sclo -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build sclo-rh http://mirror.centos.org/centos/7/sclo/\$arch/rh -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build buildsys-core http://buildsys.koozali.org/build/10/smeserver-core/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build buildsys-contribs http://buildsys.koozali.org/build/10/smeserver-contribs/\$arch/ -sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build groups http://buildsys.koozali.org/build/10/smeserver-groups/\$arch/ -sudo -u kojiadmin koji regen-repo dist-"sme$RELEASE"-build --nowait +# add build tag for all $RELEASE targets +BUILDTAG="dist-$RELEASE-build" +sudo -u kojiadmin koji add-group "$BUILDTAG" build +sudo -u kojiadmin koji add-group "$BUILDTAG" srpm-build +sudo -u kojiadmin koji add-group-pkg "$BUILDTAG" build install scl-utils-build python27-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 "$BUILDTAG" srpm-build rpm-build coreutils cpio curl-bin elfutils file git git-lfs glibc-utils grep gzip make pigz plzip rpm sed shadow tar unzip wget xz +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" os http://buildsys.koozali.org/build/7/os/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" updates http://buildsys.koozali.org/build/7/updates/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" smeos http://buildsys.koozali.org/build/10/smeos/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" smeupdates http://buildsys.koozali.org/build/10/smeupdates/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" fastrack http://buildsys.koozali.org/build/7/fastrack/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" opt1 http://buildsys.koozali.org/build/7/opt1/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" opt2 http://buildsys.koozali.org/build/7/opt2/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" opt3 http://buildsys.koozali.org/build/7/opt3/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" epel http://download.fedoraproject.org/pub/epel/7/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" openfusion http://repo.openfusion.net/centos7-\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" rpmfusion http://download1.rpmfusion.org/free/el/updates/7/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" sclo-sclo http://mirror.centos.org/centos/7/sclo/\$arch/sclo +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" sclo-rh http://mirror.centos.org/centos/7/sclo/\$arch/rh +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" buildsys-core http://buildsys.koozali.org/build/10/smeserver-core/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" buildsys-contribs http://buildsys.koozali.org/build/10/smeserver-contribs/\$arch/ +sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" groups http://buildsys.koozali.org/build/10/smeserver-groups/\$arch/ +sudo -u kojiadmin koji regen-repo dist-"$BUILDTAG" --nowait # add the build tag for this RELEASE (parent is the os target) -sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" dist-"sme$RELEASE"-build -sudo -u kojiadmin koji add-target "$TAG" dist-"sme$RELEASE"-build dist-"$TAG" +sudo -u kojiadmin koji add-tag --parent dist-"$TAG" --arches="$RPM_ARCH" "$BUILDTAG" +sudo -u kojiadmin koji add-target "$TAG" "$BUILDTAG" dist-"$TAG" # Add in all packages that make up this repo # do an api call against gitea to list all the repos in smeserver organisation # sudo -u kojiadmin koji add-pkg dist-"$TAG" $pkglist -# 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-target dist-"$TAG" dist-"$TAG"-build # setup the rest of the sme10 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" +for REPO in contribs contribs-testing addons updates updates-testing testing ; do + TAG="$RELEASE-$REPO" + sudo -u kojiadmin koji add-tag --parent dist-"$PARENT" dist-"$TAG" done +# set up the smeserver and smecontribs targets (i.e. Only build to testing for smeos and smecontribs - others are staging) +sudo -u kojiadmin koji add-target $RELEASE-test dist-"$BUILDTAG" "dist-$RELEASE-testing" +sudo -u kojiadmin koji add-target $RELEASE-contribs-test dist-"$BUILDTAG" "dist-$RELEASE-contribs-testing" # Release sme11 is based on Rocky 8 (EL8) RELEASE="sme11" DISTRIBUTION="SME Server v$RELEASE" -TAG="sme$RELEASE-os" +TAG="$RELEASE-os" PARENT="$TAG" EL="8" DIST=".el$EL.sme" @@ -172,13 +173,13 @@ for REPO in contribs contribs-testing addons updates updates-testing testing ; d sudo -u kojiadmin koji add-tag --parent "dist-$PARENT" "dist-$TAG" 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 add-target $RELEASE-test dist-"$BUILDTAG" "dist-$RELEASE-testing" +sudo -u kojiadmin koji add-target $RELEASE-contribs-test dist-"$BUILDTAG" "dist-$RELEASE-contribs-testing" # Release sme12 is based on Rocky 9 (EL9) RELEASE="12" DISTRIBUTION="SME Server v$RELEASE" -TAG="sme$RELEASE-os" +TAG="$RELEASE-os" EL="9" DIST=".el$EL.sme" PKGMANAGER="dnf" @@ -224,5 +225,5 @@ for REPO in contribs contribs-testing addons updates updates-testing testing ; d sudo -u kojiadmin koji add-tag --parent "dist-$PARENT" "dist-$TAG" 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 add-target $RELEASE-test dist-"$BUILDTAG" "dist-$RELEASE-testing" +sudo -u kojiadmin koji add-target $RELEASE-contribs-test dist-"$BUILDTAG" "dist-$RELEASE-contribs-testing"