From owner-svn-src-user@freebsd.org Tue Nov 27 11:55:44 2018 Return-Path: <owner-svn-src-user@freebsd.org> Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5533E114796B for <svn-src-user@mailman.ysv.freebsd.org>; Tue, 27 Nov 2018 11:55:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECD58736F6; Tue, 27 Nov 2018 11:55:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB9EF1AE2A; Tue, 27 Nov 2018 11:55:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wARBth59086149; Tue, 27 Nov 2018 11:55:43 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wARBthEw086148; Tue, 27 Nov 2018 11:55:43 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201811271155.wARBthEw086148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber <gjb@FreeBSD.org> Date: Tue, 27 Nov 2018 11:55:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r341015 - user/gjb/thermite X-SVN-Group: user X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: user/gjb/thermite X-SVN-Commit-Revision: 341015 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ECD58736F6 X-Spamd-Result: default: False [1.55 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.37)[0.369,0]; NEURAL_SPAM_MEDIUM(0.67)[0.666,0]; NEURAL_SPAM_LONG(0.51)[0.512,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 27 Nov 2018 11:55:44 -0000 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()