This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 7214c13e106 packaging: bundle latest cmk x86 build with deb and rpm
packages (#9450)
7214c13e106 is described below
commit 7214c13e106368127c928b2028c80c3bacaf528c
Author: Rohit Yadav <[email protected]>
AuthorDate: Tue Jul 30 10:01:39 2024 +0530
packaging: bundle latest cmk x86 build with deb and rpm packages (#9450)
This uses the latest tag to find and use the latest Github tag from
cloudstack-cloudmonkey repo, and use that to bundle the binary CLI in
packages.
Signed-off-by: Rohit Yadav <[email protected]>
Co-authored-by: Wei Zhou <[email protected]>
---
debian/rules | 3 ++-
packaging/centos8/cloud.spec | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/rules b/debian/rules
index b5280370272..e7ff6759d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ VERSION := $(shell grep '<version>' pom.xml | head -2 | tail -1
| cut -d'>' -f2
PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
SYSCONFDIR = "/etc"
DESTDIR = "debian/tmp"
+CMK_REL := $(shell wget -O -
"https://api.github.com/repos/apache/cloudstack-cloudmonkey/releases";
2>/dev/null | jq -r '.[0].tag_name')
%:
dh $@ --with systemd
@@ -85,7 +86,7 @@ override_dh_auto_install:
rm -rf
$(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/md5sum.txt
# Bundle cmk in cloudstack-management
- wget
https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.3.0/cmk.linux.x86-64
-O $(DESTDIR)/usr/bin/cmk
+ wget
https://github.com/apache/cloudstack-cloudmonkey/releases/download/$(CMK_REL)/cmk.linux.x86-64
-O $(DESTDIR)/usr/bin/cmk
chmod +x $(DESTDIR)/usr/bin/cmk
# nast hack for a couple of configuration files
diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec
index ebb7af12583..3b801f0f1f3 100644
--- a/packaging/centos8/cloud.spec
+++ b/packaging/centos8/cloud.spec
@@ -260,7 +260,8 @@ install -D
client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{
install -D client/target/utilities/bin/cloud-sysvmadm
${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
install -D client/target/utilities/bin/cloud-update-xenserver-licenses
${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
# Bundle cmk in cloudstack-management
-wget
https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.3.0/cmk.linux.x86-64
-O ${RPM_BUILD_ROOT}%{_bindir}/cmk
+CMK_REL=$(wget -O -
"https://api.github.com/repos/apache/cloudstack-cloudmonkey/releases";
2>/dev/null | jq -r '.[0].tag_name')
+wget
https://github.com/apache/cloudstack-cloudmonkey/releases/download/$CMK_REL/cmk.linux.x86-64
-O ${RPM_BUILD_ROOT}%{_bindir}/cmk
chmod +x ${RPM_BUILD_ROOT}%{_bindir}/cmk
cp -r client/target/utilities/scripts/db/*
${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
