From de42a88c151a53a5cd140676af6cd93d30ca104e Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Thu, 18 Jul 2024 16:39:56 +1000 Subject: [PATCH] more tidying of tags --- koji-setup/koji-bootstrap-build.sh | 149 +++++++++++++++-------------- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index d50549b..31e3c41 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -65,21 +65,22 @@ VENDOR="Koozali.org " # sme10-os is the parent - all other sme10 repos will inherit most of this... RELEASE="sme10" DISTRIBUTION="SME Server v$RELEASE" -TAG="$RELEASE-os" +TAG="dist-$RELEASE-os" PARENT="$TAG" DIST=".el7.sme" PKGMANAGER="yum" BOOTSTRAPIMAGE="centos:7" -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" -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-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 mock.chroot_setup_cmd="$CHROOTSETUPCMD" "$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="dist-$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 "$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 @@ -100,33 +101,30 @@ sudo -u kojiadmin koji add-external-repo -t "$BUILDTAG" sclo-rh http://mirror.ce 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" "$BUILDTAG" -sudo -u kojiadmin koji add-target "$TAG" "$BUILDTAG" dist-"$TAG" +sudo -u kojiadmin koji regen-repo "$BUILDTAG" --nowait # 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 +# sudo -u kojiadmin koji add-pkg "$TAG" $pkglist # setup the rest of the sme10 repos 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" + TAG="dist-$RELEASE-$REPO" + sudo -u kojiadmin koji add-tag --parent "$PARENT" "$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" +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" # Release sme11 is based on Rocky 8 (EL8) RELEASE="sme11" DISTRIBUTION="SME Server v$RELEASE" -TAG="$RELEASE-os" +TAG="dist-$RELEASE-os" PARENT="$TAG" EL="8" DIST=".el$EL.sme" PKGMANAGER="dnf" BOOTSTRAPIMAGE="rockylinux:$EL" -sudo -u kojiadmin koji add-external-repo smeos$EL http://koji.koozali.org/kojifiles/repos-dist/$TAG/latest/\$arch/ +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 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/ @@ -141,49 +139,51 @@ sudo -u kojiadmin koji add-external-repo remi$EL http://rpms.remirepo.net/enterp 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 -sudo -u kojiadmin koji add-tag --arches="$RPM_ARCH" dist-"$PARENT" -sudo -u kojiadmin koji edit-tag -x mock.package_manager="$PKGMANAGER" dist-"$PARENT" -sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$PARENT" -sudo -u kojiadmin koji edit-tag -x rpm.macro.distribution="$DISTRIBUTION" dist-"$PARENT" -sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$PARENT" -sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PACKAGER" dist-"$PARENT" -sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$PARENT" +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 all $RELEASE targets -BUILDTAG="$RELEASE-build" -sudo -u kojiadmin koji add-tag --parent dist-"$PARENT" --arches="$RPM_ARCH" dist-"$BUILDTAG" -sudo -u kojiadmin koji add-group dist-"$BUILDTAG" build -sudo -u kojiadmin koji add-group-pkg dist-"$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 dist-"$BUILDTAG" srpm-build -sudo -u kojiadmin koji add-group-pkg dist-"$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz +BUILDTAG="dist-$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 dist="$BUILDTAG" livemedia-build -sudo -u kojiadmin koji add-group-pkg dist-"$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 dist-"$BUILDTAG" -m bare os$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare remi-safe$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare remi-modular$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare appstream$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare powertools$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare epel$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare openfusion$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare rpmfusion$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare remi$EL -sudo -u kojiadmin koji regen-repo dist-"$BUILDTAG" --nowait +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="$RELEASE-$REPO" - sudo -u kojiadmin koji add-tag --parent "dist-$PARENT" "dist-$TAG" + TAG="dist-$RELEASE-$REPO" + sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG" done # set up the smeserver and smecontribs targets -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" +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" # Release sme12 is based on Rocky 9 (EL9) RELEASE="12" DISTRIBUTION="SME Server v$RELEASE" -TAG="$RELEASE-os" +TAG="dist-$RELEASE-os" 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 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/ @@ -195,35 +195,36 @@ 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 -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 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-tag --arches="$RPM_ARCH" "$TAG" +sudo -u kojiadmin koji edit-tag "$TAG" -x mock.package_manager="$PKGMANAGER" +sudo -u kojiadmin koji add-tag --parent "$TAG" --arches="$RPM_ARCH" "$TAG"-build +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="$RELEASE-build" -sudo -u kojiadmin koji add-tag --parent dist-"$PARENT" --arches="$RPM_ARCH" dist-"$BUILDTAG" -sudo -u kojiadmin koji add-group dist-"$BUILDTAG" build -sudo -u kojiadmin koji add-group-pkg dist-"$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 dist-"$BUILDTAG" srpm-build -sudo -u kojiadmin koji add-group-pkg dist-"$BUILDTAG" srpm-build coreutils cpio elfutils file grep gzip make pigz rpm rpm-build sed tar unzip wget xz +sudo -u kojiadmin koji add-tag --parent dist-"$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 dist="$BUILDTAG" livemedia-build -sudo -u kojiadmin koji add-group-pkg dist-"$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 dist-"$BUILDTAG" -m bare os$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare appstream$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare powertools$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BILDTAG" -m bare epel$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare openfusion$EL -sudo -u kojiadmin koji add-external-repo -t dist-"$BUILDTAG" -m bare rpmfusion$EL -sudo -u kojiadmin koji regen-repo dist-"$BUILDTAG" --nowait +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 +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="$RELEASE-$REPO" - sudo -u kojiadmin koji add-tag --parent "dist-$PARENT" "dist-$TAG" + TAG="dist-$RELEASE-$REPO" + sudo -u kojiadmin koji add-tag --parent "$PARENT" "$TAG" done # set up the smeserver and smecontribs targets -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" +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"