From b9cf0216c7eaa9d7487f1ea49c9a29b2d0cafc3c Mon Sep 17 00:00:00 2001
From: Andrea Valassi <andrea.valassi@cern.ch>
Date: Mon, 6 Nov 2017 16:42:18 +0100
Subject: [PATCH] Do not sign with the WLCG signature for (pre-)release
candidates
---
pkg.sh | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/pkg.sh b/pkg.sh
index 7f5f3b1..d5fa1d5 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -318,7 +318,7 @@ elif [ "$step" == "build" ] || [ "$step" == "rebuild" ]; then
if [ "$step" == "rebuild" ]; then
if [ "${brn#ubuntu}" == ${brn} ]; then # NOT Ubuntu
if ! ${use_rpmbuild}; then
- echo "ERROR! Step '--$step' is not available on $brn"
+ echo "ERROR! Step '--$step' is not available on $brn"
usage
fi
fi
@@ -623,20 +623,20 @@ elif [ "$step" == "release" ]; then
wget -q https://koji.cern.ch/kojifiles/packages/${nam}/${vrs}/${dis}/src/${rpmsr} -O ${tmpd}/${rpmsr}
# Is this a (pre)-release-candidate?
if ${is_rc}; then
- # (Pre)-release-candidate: do not distribute for installation
- # Sign (without installing) for the WLCG repository
+ # (Pre)-release-candidate: do not distribute for installation
+ # No longer sign (without installing) for the WLCG repository
pushd ${tmpd} > /dev/null
- printf "=== Sign rpm's with the WLCG signature ===\n"
- ${wlcgsign} -signonly ${rpm64}
- ${wlcgsign} -signonly ${rpmsr}
- printf "\n"
+ ###printf "=== Sign rpm's with the WLCG signature ===\n"
+ ###${wlcgsign} -signonly ${rpm64}
+ ###${wlcgsign} -signonly ${rpmsr}
+ ###printf "\n"
popd > /dev/null
# Do not install in WLCG or promote to VR-stable in koji
echo "WARNING: tag ${tag} is a (pre-)release-candidate"
echo "WARNING: skip installation in WLCG and SLC6/CC7 repos"
else
- # Production release
- # Sign and install in the WLCG repository
+ # Production release
+ # Sign and install in the WLCG repository
pushd ${tmpd} > /dev/null
printf "=== Sign and install rpm's in the the WLCG repo ===\n"
${wlcgsign} ${rpm64}
@@ -654,6 +654,7 @@ elif [ "$step" == "release" ]; then
fi
fi
fi
+ printf "\n"
fi
# Update, commit and push the README file for the new release
--
GitLab