From 0d0d685a0417eb80c1ec17a20efedf79b2ad6b35 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Mon, 6 Nov 2023 13:55:26 +1100 Subject: [PATCH] fix smecontribs bootstrap --- koji-setup/koji-bootstrap-build.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/koji-setup/koji-bootstrap-build.sh b/koji-setup/koji-bootstrap-build.sh index 7f66dd6..6d74f4a 100755 --- a/koji-setup/koji-bootstrap-build.sh +++ b/koji-setup/koji-bootstrap-build.sh @@ -92,14 +92,25 @@ sudo -u kojiadmin koji add-external-repo -t dist-"$TAG"-build buildsys-core http 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-"$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 install @buildsys-build @buildsys scl-utils-build python27-build rpm-build +sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build rpm-build coreutils cpio curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm sed shadow tar unzip wget xz +sudo -u kojiadmin koji regen-repo dist-$TAG-build --nowait # setup the rest of the sme10 repos -for REPO in contribs addons updates updates-testing testing ; do +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 -# Only build for smeos and smecontribs - others are staging -sudo -u kojiadmin koji add-tag --parent dist-sme$RELEASE-contribs dist-sme$RELEASE-contribs-build -sudo -u kojiadmin koji regen-repo dist-sme$RELEASE-contribs-build --nowait + # Releases sme11 and sme12 are based on Rocky 8 PKGMANAGER="dnf" BOOTSTRAPIMAGE="rocky:8"