smedev/smeserver-koji
6
0
Fork 0
mirror of https://src.koozali.org/infra/smeserver-koji.git synced 2024-11-24 18:47:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

move packager and vendor to kojid.conf

Browse Source
This commit is contained in:
Trevor Batley 2023-11-07 19:46:43 +11:00
parent 05580f8a62
commit 6f85299a71
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
koji-setup/koji-bootstrap-build.sh
View File

@ -58,9 +58,6 @@ if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then
rm -rf "$STAGING_RPM_DIR" "$HOME/.koji" rm -rf "$STAGING_RPM_DIR" "$HOME/.koji"
fi fi
# Generic settings for smeserver
PACKAGER="Koozali.org <http://www.koozali.org>"
VENDOR="Koozali.org <http://www.koozali.org>"
# Setup sme10 for building - based on centos 7 (el7) # Setup sme10 for building - based on centos 7 (el7)
# sme10-os is the parent - all other sme10 repos will inherit most of this... # sme10-os is the parent - all other sme10 repos will inherit most of this...
RELEASE=10 RELEASE=10
@ -77,8 +74,6 @@ sudo -u kojiadmin koji add-target dist-"$TAG" dist-"$TAG"-build
sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" 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 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.distribution="$DISTRIBUTION" dist-"$TAG"
sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PKGMANAGER" dist-"$TAG"
sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG"
sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG"
sudo -u kojiadmin koji add-group dist-"$TAG"-build 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 add-group dist-"$TAG"-build srpm-build
@ -149,8 +144,6 @@ for RELEASE in 11 12 ; do
sudo -u kojiadmin koji edit-tag -x mock.bootstrap_image="$BOOTSTRAPIMAGE" dist-"$TAG" 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 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.distribution="$DISTRIBUTION" dist-"$TAG"
sudo -u kojiadmin koji edit-tag -x rpm.macro.packager="$PKGMANAGER" dist-"$TAG"
sudo -u kojiadmin koji edit-tag -x rpm.macro.vendor="$VENDOR" dist-"$TAG"
sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" dist-"$TAG" sudo -u kojiadmin koji edit-tag -x rpm.macro.dist="$DIST" 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 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 curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm rpm-build sed shadow tar unzip wget xz sudo -u kojiadmin koji add-group-pkg dist-"$TAG"-build srpm-build coreutils cpio curl-bin elfutils file git glibc-utils grep gzip make pigz plzip rpm rpm-build sed shadow tar unzip wget xz

2
koji-setup/koji-deploy-builder.sh
View File

@ -69,6 +69,8 @@ allowed_scms=$KOJI_ALLOWED_SCMS
cert = $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem cert = $KOJI_PKI_DIR/$KOJI_BUILD_FQDN.pem
serverca = $KOJI_PKI_DIR/koji_ca_cert.crt serverca = $KOJI_PKI_DIR/koji_ca_cert.crt
mock_bootstrap_image=False mock_bootstrap_image=False
packager="Koozali.org <http://www.koozali.org>"
vendor="Koozali.org <http://www.koozali.org>"
EOF EOF
if env | grep -q proxy; then if env | grep -q proxy; then