This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 8104e75 Add RHEL version to grove RPM filename (#5631)
8104e75 is described below
commit 8104e750ae2858132345a29592e8b9107eae5ab1
Author: Jonathan G <[email protected]>
AuthorDate: Thu Mar 11 17:45:21 2021 -0700
Add RHEL version to grove RPM filename (#5631)
This makes grove consistent with every other ATC rpm
---
grove/build/build_rpm.sh | 4 ++--
grove/grovetccfg/build/build_rpm.sh | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/grove/build/build_rpm.sh b/grove/build/build_rpm.sh
index 9e980f2..1406cb7 100755
--- a/grove/build/build_rpm.sh
+++ b/grove/build/build_rpm.sh
@@ -42,7 +42,7 @@ checkGroveEnvironment() {
BUILD_NUMBER=${BUILD_NUMBER:-$(getBuildNumber)}
RPMBUILD="${GROVE_DIR}/rpmbuild"
DIST="${TC_DIR}/dist"
- RPM="${PACKAGE}-${GROVE_VERSION}-${BUILD_NUMBER}.x86_64.rpm"
+
RPM="${PACKAGE}-${GROVE_VERSION}-${BUILD_NUMBER}.${RHEL_VERSION}.x86_64.rpm"
GOOS="${GOOS:-linux}"
RPM_TARGET_OS="${RPM_TARGET_OS:-$GOOS}"
export GROVE_DIR GROVE_VERSION PACKAGE BUILD_NUMBER RPMBUILD DIST RPM
GOOS RPM_TARGET_OS
@@ -102,7 +102,7 @@ buildRpmGrove() {
rpmbuild \
--define "_topdir $RPMBUILD" \
--define "version ${GROVE_VERSION}" \
- --define "build_number ${BUILD_NUMBER}" \
+ --define "build_number ${BUILD_NUMBER}.${RHEL_VERSION}" \
--define "_target_os ${RPM_TARGET_OS}" \
--define '%_source_payload w2.xzdio' \
--define '%_binary_payload w2.xzdio' \
diff --git a/grove/grovetccfg/build/build_rpm.sh
b/grove/grovetccfg/build/build_rpm.sh
index 759f257..58f45a9 100755
--- a/grove/grovetccfg/build/build_rpm.sh
+++ b/grove/grovetccfg/build/build_rpm.sh
@@ -42,7 +42,7 @@ checkGroveEnvironment() {
BUILD_NUMBER=${BUILD_NUMBER:-$(getBuildNumber)}
RPMBUILD="${GROVE_DIR}/rpmbuild"
DIST="${TC_DIR}/dist"
- RPM="${PACKAGE}-${GROVE_VERSION}-${BUILD_NUMBER}.x86_64.rpm"
+
RPM="${PACKAGE}-${GROVE_VERSION}-${BUILD_NUMBER}.${RHEL_VERSION}.x86_64.rpm"
GOOS="${GOOS:-linux}"
RPM_TARGET_OS="${RPM_TARGET_OS:-$GOOS}"
export GROVETC_DIR GROVE_DIR GROVE_VERSION PACKAGE BUILD_NUMBER
RPMBUILD DIST RPM GOOS RPM_TARGET_OS
@@ -103,7 +103,7 @@ buildRpmGrove() {
rpmbuild \
--define "_topdir $RPMBUILD" \
--define "version ${GROVE_VERSION}" \
- --define "build_number ${BUILD_NUMBER}" \
+ --define "build_number ${BUILD_NUMBER}.${RHEL_VERSION}" \
--define "_target_os ${RPM_TARGET_OS}" \
--define '%_source_payload w2.xzdio' \
--define '%_binary_payload w2.xzdio' \
@@ -120,4 +120,3 @@ checkEnvironment -i go
checkGroveEnvironment
initBuildArea
buildRpmGrove
-
