From owner-svn-src-user@freebsd.org  Sat Jun 25 02:09:50 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2621B73CEE
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sat, 25 Jun 2016 02:09:50 +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 mx1.freebsd.org (Postfix) with ESMTPS id 8371E11AE;
 Sat, 25 Jun 2016 02:09:50 +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 u5P29nYo094370;
 Sat, 25 Jun 2016 02:09:49 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5P29nfF094369;
 Sat, 25 Jun 2016 02:09:49 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201606250209.u5P29nfF094369@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: Sat, 25 Jun 2016 02:09:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r302188 - user/gjb/thermite
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 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: Sat, 25 Jun 2016 02:09:50 -0000

Author: gjb
Date: Sat Jun 25 02:09:49 2016
New Revision: 302188
URL: https://svnweb.freebsd.org/changeset/base/302188

Log:
  Remove upload_azure_image(), as Microsoft has overtaken creating Azure
  VM images (and thank you for doing this!).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  user/gjb/thermite/thermite.sh

Modified: user/gjb/thermite/thermite.sh
==============================================================================
--- user/gjb/thermite/thermite.sh	Sat Jun 25 02:07:12 2016	(r302187)
+++ user/gjb/thermite/thermite.sh	Sat Jun 25 02:09:49 2016	(r302188)
@@ -342,39 +342,6 @@ upload_ec2_ami() {
 	return 0
 } # upload_ec2_ami()
 
-# Upload Microsoft Azure virtual machine images.
-upload_azure_image() {
-	_build="${rev}-${arch}-${kernel}-${type}"
-	_conf="${scriptdir}/${_build}.conf"
-	source_config || return 0
-	case ${arch} in
-		amd64)
-			;;
-		*)
-			return 0
-			;;
-	esac
-	if [ -z "${AZURE_UPLOAD_CONF}" ]; then
-		return 0
-	fi
-	info "Uploading Azure virtual machine image for build: ${_build}"
-	if [ ! -e "${CHROOTDIR}/${AZURE_UPLOAD_CONF}" ]; then
-		cp -p ${AZURE_UPLOAD_CONF} ${CHROOTDIR}/${AZURE_UPLOAD_CONF}
-		if [ $? -ne 0 ]; then
-			info "Azure key file not found."
-			return 0
-		fi
-	fi
-	mount -t devfs devfs ${CHROOTDIR}/dev
-	chroot ${CHROOTDIR} make -C /usr/src/release \
-		AZURE_UPLOAD_CONF=${AZURE_UPLOAD_CONF} \
-		azure-upload \
-		>> ${logdir}/${_build}.azure.log 2>&1
-	unset _build _conf AZURE_UPLOAD_CONF
-	umount ${CHROOTDIR}/dev
-	return 0
-} # upload_azure_image()
-
 # Upload Vagrant virtual machine images.
 upload_vagrant_image() {
 	_build="${rev}-${arch}-${kernel}-${type}"
@@ -545,7 +512,6 @@ main() {
 	runall install_chroots
 	runall build_release
 	runall upload_ec2_ami
-	#runall upload_azure_image
 	runall upload_gce_image
 	runall upload_vagrant_image
 }