svn commit: r341015 - user/gjb/thermite

[Glen Barber]

Author: gjb
Date: Tue Nov 27 11:55:43 2018
New Revision: 341015
URL: https://svnweb.freebsd.org/changeset/base/341015

Log:
  Resync thermite with the re@ version:
  
  - upload_ec2_ami():
   - Set EC2PUBLICSNAP
   - Set EC2SNSTOPIC
   - Unset EC2-specific variables when complete
   - Break a line in two to avoid unintentional target clobbering
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Tue Nov 27 11:22:19 2018	(r341014)
+++ user/gjb/thermite/thermite.sh	Tue Nov 27 11:55:43 2018	(r341015)
@@ -368,9 +368,12 @@ upload_ec2_ami() {
 		AWSREGION=${AWSREGION} \
 		AWSBUCKET=${AWSBUCKET} \
 		AWSKEYFILE=${AWSKEYFILE} \
-		EC2PUBLIC=${EC2PUBLIC} ec2ami \
+		EC2PUBLIC=${EC2PUBLIC} \
+		EC2PUBLICSNAP=${EC2PUBLICSNAP} \
+		EC2SNSTOPIC=${EC2SNSTOPIC} \
+		ec2ami \
 		>> ${logdir}/${_build}.ec2.log 2>&1
-	unset _build _conf AWSREGION AWSBUCKET AWSKEYFILE EC2PUBLIC
+	unset _build _conf AWSREGION AWSBUCKET AWSKEYFILE EC2PUBLIC EC2SNSTOPIC EC2PUBLICSNAP
 	umount ${CHROOTDIR}/dev
 	return 0
 } # upload_ec2_ami()