From c6d5482dfda329ceac18430abe665e0f029aee0a Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Fri, 5 Jul 2024 18:03:17 +1000 Subject: [PATCH] align sme11 and sme12 build and tags with reality --- koji-setup/koji-bootstrap-build.sh | 61 +++++++++++++----------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index 8058a1b..949572f 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -151,9 +151,11 @@ sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$PARENT" 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 dist-"$BUILDTAG" srpm-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-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 @@ -195,43 +197,32 @@ sudo -u kojiadmin koji add-external-repo rpmfusion$EL http://download1.rpmfusion 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" +# 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-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 +# 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" 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"