This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new c07e472 When cutting a release, and having built rpm noboolean
packages, copy files separately
c07e472 is described below
commit c07e4728a1f21b77f9a4fcdf255c434ec6716aaa
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue Sep 13 00:34:24 2022 +0200
When cutting a release, and having built rpm noboolean packages, copy files
separately
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17880
---
cassandra-release/prepare_release.sh | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/cassandra-release/prepare_release.sh
b/cassandra-release/prepare_release.sh
index b3666e9..6beedff 100755
--- a/cassandra-release/prepare_release.sh
+++ b/cassandra-release/prepare_release.sh
@@ -325,6 +325,8 @@ then
execute "mkdir -p $rpm_package_dir"
execute "cd $rpm_package_dir"
+ echo "Building redhat packages ..." 1>&3 2>&4
+
[ $fake_mode -eq 1 ] && echo ">> declare -x
rpm_dir=$rpm_package_dir/cassandra_${release}_rpm"
declare -x rpm_dir=$rpm_package_dir/cassandra_${release}_rpm
[ ! -e "$rpm_dir" ] || rm -rf $rpm_dir
@@ -334,6 +336,16 @@ then
execute "rpmsign --addsign ${rpm_dir}/*.rpm"
+ # build repositories
+ echo "Building redhat repository ..." 1>&3 2>&4
+ execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat"
+ execute "cp ${rpm_dir}/*.rpm
$tmp_dir/cassandra-dist-dev/${release}/redhat/"
+ execute "cd $tmp_dir/cassandra-dist-dev/${release}/redhat/"
+ execute "createrepo ."
+ # FIXME - put into execute "…"
+ [ $fake_mode -eq 1 ] || for f in repodata/repomd.xml repodata/*.bz2
repodata/*.gz ; do gpg --detach-sign --armor $f ; done
+
+
# noboolean RPMs
if [ -d "$current_dir/redhat/noboolean" ]; then
execute "cd $tmp_dir"
@@ -341,6 +353,8 @@ then
execute "mkdir -p $rpmnoboolean_package_dir"
execute "cd $rpmnoboolean_package_dir"
+ echo "Building redhat noboolean packages ..." 1>&3 2>&4
+
[ $fake_mode -eq 1 ] && echo ">> declare -x
rpm_dir=$rpmnoboolean_package_dir/cassandra_${release}_rpmnoboolean"
declare -x
rpm_dir=$rpmnoboolean_package_dir/cassandra_${release}_rpmnoboolean
[ ! -e "$rpm_dir" ] || rm -rf $rpm_dir
@@ -349,31 +363,13 @@ then
execute
"${cassandra_builds_dir}/build-scripts/cassandra-rpm-packaging.sh
${release}-tentative 8 noboolean"
execute "rpmsign --addsign ${rpm_dir}/*.rpm"
- fi
-
- # build repositories
- execute "cd $tmp_dir"
- execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat"
- execute "cp ${rpm_dir}/*.rpm
$tmp_dir/cassandra-dist-dev/${release}/redhat/"
-
- if [ -d "$current_dir/redhat/noboolean" ]; then
+ # build repositories
+ echo "Building redhat noboolean repository ..." 1>&3 2>&4
execute "mkdir $tmp_dir/cassandra-dist-dev/${release}/redhat/noboolean"
execute "cp ${rpm_dir}/*.rpm
$tmp_dir/cassandra-dist-dev/${release}/redhat/noboolean"
- fi
-
- echo "Building redhat repository ..." 1>&3 2>&4
-
- execute "cd $tmp_dir/cassandra-dist-dev/${release}/redhat/"
- execute "createrepo ."
-
- # FIXME - put into execute "…"
- [ $fake_mode -eq 1 ] || for f in repodata/repomd.xml repodata/*.bz2
repodata/*.gz ; do gpg --detach-sign --armor $f ; done
-
- if [ -d "$current_dir/redhat/noboolean" ]; then
execute "cd $tmp_dir/cassandra-dist-dev/${release}/redhat/noboolean"
execute "createrepo ."
-
# FIXME - put into execute "…"
[ $fake_mode -eq 1 ] || for f in repodata/repomd.xml repodata/*.bz2
repodata/*.gz ; do gpg --detach-sign --armor $f ; done
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
