You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by da...@apache.org on 2017/05/29 04:20:26 UTC
svn commit: r1796571 - in /spamassassin/trunk/build/mkupdates:
do-stable-update-with-scores mkupdate-with-scores
Author: davej
Date: Mon May 29 04:20:26 2017
New Revision: 1796571
URL: http://svn.apache.org/viewvc?rev=1796571&view=rev
Log:
Fixed paths for new server.
Modified:
spamassassin/trunk/build/mkupdates/do-stable-update-with-scores
spamassassin/trunk/build/mkupdates/mkupdate-with-scores
Modified: spamassassin/trunk/build/mkupdates/do-stable-update-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/do-stable-update-with-scores?rev=1796571&r1=1796570&r2=1796571&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/do-stable-update-with-scores (original)
+++ spamassassin/trunk/build/mkupdates/do-stable-update-with-scores Mon May 29 04:20:26 2017
@@ -22,7 +22,7 @@ if [ $RV -ne 0 ] ; then
else
echo 'Running mkupdate-with-scores...'
echo ''
- /usr/local/spamassassin/svn/trunk/build/mkupdates/mkupdate-with-scores
+ /usr/local/spamassassin/automc/svn/build/mkupdates/mkupdate-with-scores
RV=$?
if [ $RV -ne 0 ] ; then
echo "Exit Status $RV is not zero for mkupdate-with-scores"
Modified: spamassassin/trunk/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/mkupdate-with-scores?rev=1796571&r1=1796570&r2=1796571&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/trunk/build/mkupdates/mkupdate-with-scores Mon May 29 04:20:26 2017
@@ -39,9 +39,8 @@ set -x
umask 022
-UPDATEDIR=/var/www/buildbot.spamassassin.org/updatestage
-DNSDIR=/var/named/updates.spamassassin.org.d
-KEYDIR=/home/updatesd/key
+UPDATEDIR=/var/www/bbmass.spamassassin.org/updates
+KEYDIR=/usr/local/spamassassin/automc/key
UPDATE_BUILD_DIR=0
REVERT_REVISION=0
@@ -108,41 +107,16 @@ update_dns_record() {
fi
# turn "3.2.0" into "0.2.3"
- RVERS=`echo $SA_VERSION | perl -pe 's/^(\d+)\.(\d+)\.(\d+)$/$3.$2.$1/'`
+ RVERS=`echo $SA_VERSION | rev`
DNS_RECORD="$RVERS TXT \"$UPDATE_REVISION\""
echo "DNS Record: $DNS_RECORD"
- DNSFILE="$DNSDIR/$SA_VERSION"
-
- mkdir $TMPDIR/dns-backup
-
- set +e
- cp $DNSFILE $TMPDIR/dns-backup/.
- set -e
-
- # set -e should catch any errors here
- echo $DNS_RECORD > $DNSFILE.mkupdate-with-scores.new
- mv $DNSFILE.mkupdate-with-scores.new $DNSFILE
+ /usr/local/bin/updateDNS.sh ${RVERS}.updates TXT $UPDATE_REVISION
return 0
}
-revert_dns_record() {
- SA_VERSION=$1
-
- if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then
- echo "DNS updating disabled (auto update publishing disabled), skipping DNS record revert"
- return 0
- fi
-
- DNSFILE="$DNSDIR/$SA_VERSION"
-
- set +e
- cp $TMPDIR/dns-backup/$SA_VERSION $DNSFILE
- set -e
-}
-
copy_update_paranoid() {
SRC=$1
DST=$2
@@ -306,60 +280,40 @@ fi
UPDATED_VERSIONS=0
MINOR_VERS=0
-for (( MINOR_VERS=0; 1; MINOR_VERS++ )); do
- set +e
- svn info https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_3_$MINOR_VERS | grep Revision
- VERSION_EXISTS=$?
- set -e
- if [ $VERSION_EXISTS -ne 0 ]; then
- break;
- fi
- test_version 3.3.$MINOR_VERS tags/spamassassin_release_3_3_$MINOR_VERS \
- && update_dns_record "3.3.$MINOR_VERS" "$REVISION" && UPDATED_VERSIONS=$((UPDATED_VERSIONS+1))
-done
-
-# we just assume that the next stable version is the branch's current version
-test_version 3.3.$MINOR_VERS branches/3.3 \
- && update_dns_record "3.3.$MINOR_VERS" "$REVISION" && UPDATED_VERSIONS=$((UPDATED_VERSIONS+1))
+#for (( MINOR_VERS=3; 1; MINOR_VERS++ )); do
+# for (( UPDATE_VERS=0; 1; UPDATE_VERS++ )); do
+
+# Temporarily only check against 3.3.3 since the DNS TXT records all CNAME to 3.3.3.updates.spamassassin.org
+MINOR_VERS=3
+UPDATE_VERS=3
+ set +e
+ svn info https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_${MINOR_VERS}_${UPDATE_VERS} | grep Revision
+ VERSION_EXISTS=$?
+ set -e
+ [[ $VERSION_EXISTS -ne 0 ]] && break
+ test_version 3.${MINOR_VERS}.${UPDATE_VERS} tags/spamassassin_release_3_${MINOR_VERS}_${UPDATE_VERS} && ((UPDATED_VERSIONS++))
+# done
+
+ # we just assume that the next stable version is the branch's current version
+ test_version 3.${MINOR_VERS}.${UPDATE_VERS} branches/3.${MINOR_VERS}.${UPDATE_VERS} && ((UPDATED_VERSIONS++))
+#done
echo "VERSIONS UPDATE PASSED ON: $UPDATED_VERSIONS"
# publish update
if [ $UPDATED_VERSIONS -gt 0 ]; then
- # be careful, we want to make sure that the DNS records are always in a good state;
- # even if we end up exiting unexpectedly due to an error
- EXIT=0
(
copy_update_paranoid "$TMPDIR/$REVISION.tar.gz" "$UPDATEDIR/$REVISION.tar.gz" &&
copy_update_paranoid "$TMPDIR/$REVISION.tar.gz.asc" "$UPDATEDIR/$REVISION.tar.gz.asc" &&
copy_update_paranoid "$TMPDIR/$REVISION.tar.gz.sha1" "$UPDATEDIR/$REVISION.tar.gz.sha1" &&
chmod 544 $UPDATEDIR/$REVISION.tar.gz*
- ) || EXIT=5
-
- # copying the update files went wrong, revert dns and exit
- if [ $EXIT -gt 0 ]; then
- for (( I=0; I<=$MINOR_VERS; I++ )); do
- revert_dns_record "3.3.$I"
- done
- exit $EXIT
- fi
-
- # schedule dns commit/reload atq job
- # note that we're probably not going to be able to commit the DNS changes
- # until the update tarball mirrors have had time to sync since the ASF
- # name servers will probably update and reload via a commit hook trigger or
- # on a set interval
+ ) || exit 5
if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then
echo "DNS updating disabled (auto update publishing disabled), skipping DNS reload"
else
- # delete any existing jobs in at queue 'n' used for named reloads
- for JOB in `at -l -q n | cut -d" " -f1`; do atrm $JOB; done
-
- # schedule a job to tick the zone serial and reload named in 16 minutes
- # (mirror rsyncs are done every 15 minutes)
- cd
- echo "/export/home/updatesd/svn/spamassassin/build/mkupdates/tick_zone_serial" | at -q n now + 16min
+ # Currently all supported sa-updated DNS records are CNAMEd to 3.3.3.updates.spamassassin.org
+ update_dns_record 3.3.3 $REVISION
fi
fi