From ca7b00a753866d37ebc2d2af243ff466de8460a8 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Tue, 19 Dec 2023 23:34:12 +0300 Subject: [PATCH] PMM-12314 temp disable debug packages --- build/scripts/build-server-rpm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build/scripts/build-server-rpm b/build/scripts/build-server-rpm index 58f619ffda..47b78cd1d7 100755 --- a/build/scripts/build-server-rpm +++ b/build/scripts/build-server-rpm @@ -31,7 +31,7 @@ is_build_needed() { # s3://pmm-build-cache/RELEASE/7 - el7 # s3://pmm-build-cache/RELEASE/9 - el9 - # This is for el9 + # RPM_EPOCH is set for Feature Builds if [ -n "$RPM_EPOCH" ]; then aws s3 sync \ --region us-east-2 \ @@ -65,7 +65,7 @@ prepare_specs() { sed -i -e "s/global commit.*/global commit ${full_commit}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec if [[ ${spec_name} != "grafana" ]]; then - sed -i -e "s/Version:.*/Version: ${pmm_version}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec + sed -i -e "s/Version:.*/Version: ${pmm_version}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec fi if [ -z "${full_pmm_version}" ]; then @@ -112,9 +112,9 @@ build() { sudo chown -R builder:builder /home/builder/rpm/RPMS /home/builder/rpm/SOURCES # Add 'Epoch' to spec file to prevent update of rpms which are built in PR build - if [ -n \"$RPM_EPOCH\" ]; then - sed -i '/^Version:.*/i Epoch: 1' /home/builder/rpm/SOURCES/${spec_name}.spec - fi + # if [ -n \"$RPM_EPOCH\" ]; then + # sed -i '/^Version:.*/i Epoch: 1' /home/builder/rpm/SOURCES/${spec_name}.spec + # fi rm -rf /home/builder/rpm/RPMS/${spec_name}-* @@ -122,14 +122,17 @@ build() { | sudo tee /etc/yum.repos.d/local.repo until /usr/bin/createrepo_c --update /home/builder/rpm/RPMS; do - echo waiting - sleep 1 + echo waiting + sleep 1 done sudo yum-builddep --randomwait=1 -y SOURCES/${spec_name}.spec spectool -C SOURCES -g SOURCES/${spec_name}.spec - rpmbuild --define '_rpmdir %{_topdir}/RPMS/${spec_name}-${rpm_version}' --define 'dist .${rpmbuild_dist}' -ba SOURCES/${spec_name}.spec + rpmbuild --define '_rpmdir %{_topdir}/RPMS/${spec_name}-${rpm_version}' \ + --define 'dist .${rpmbuild_dist}' \ + --define 'debug_package %{nil}' \ + -ba SOURCES/${spec_name}.spec rm -f SOURCES/${spec_name}.spec* sudo chown -R $(id -u):$(id -g) /home/builder/rpm/RPMS /home/builder/rpm/SOURCES