From owner-svn-src-user@freebsd.org Wed Jul 1 17:19:51 2015 Return-Path: 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 D96B4992B41 for ; Wed, 1 Jul 2015 17:19:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BE5BF1A4A; Wed, 1 Jul 2015 17:19:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t61HJpe4042317; Wed, 1 Jul 2015 17:19:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t61HJphb042316; Wed, 1 Jul 2015 17:19:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507011719.t61HJphb042316@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 1 Jul 2015 17:19:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r285013 - 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.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2015 17:19:52 -0000 Author: gjb Date: Wed Jul 1 17:19:51 2015 New Revision: 285013 URL: https://svnweb.freebsd.org/changeset/base/285013 Log: Resync with RE repository, adding bits to upload GCE and Vagrant images automatically. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Wed Jul 1 16:50:01 2015 (r285012) +++ user/gjb/thermite/thermite.sh Wed Jul 1 17:19:51 2015 (r285013) @@ -314,7 +314,7 @@ upload_ec2_ami() { return 0 ;; esac - info "Building EC2 AMI for build: ${_build}" + info "Uploading EC2 AMI image for build: ${_build}" if [ ! -e "${CHROOTDIR}/${AWSKEYFILE}" ]; then cp -p ${AWSKEYFILE} ${CHROOTDIR}/${AWSKEYFILE} if [ $? -ne 0 ]; then @@ -370,6 +370,76 @@ upload_azure_image() { return 0 } # upload_azure_image() +# Upload Vagrant virtual machine images. +upload_vagrant_image() { + _build="${rev}-${arch}-${kernel}-${type}" + _conf="${scriptdir}/${_build}.conf" + source_config || return 0 + case ${arch} in + amd64) + ;; + *) + return 0 + ;; + esac + if [ -z "${VAGRANT_UPLOAD_CONF}" ]; then + return 0 + fi + info "Uploading Vagrant virutal machine image for build: ${_build}" + if [ ! -e "${CHROOTDIR}/${VAGRANT_UPLOAD_CONF}" ]; then + cp -p ${VAGRANT_UPLOAD_CONF} \ + ${CHROOTDIR}/${VAGRANT_UPLOAD_CONF} + if [ $? -ne 0 ]; then + info "Vagrant key file not found." + return 0 + fi + fi + mount -t devfs devfs ${CHROOTDIR}/dev + chroot ${CHROOTDIR} make -C /usr/src/release \ + VAGRANT_UPLOAD_CONF=${VAGRANT_UPLOAD_CONF} \ + vagrant-upload \ + >> ${logdir}/${_build}.vagrant.log 2>&1 + unset _build _conf VAGRANT_UPLOAD_CONF + umount ${CHROOTDIR}/dev + return 0 +} # upload_vagrant_image() + +# Upload Google Compute Engine virtual machine images. +upload_gce_image() { + _build="${rev}-${arch}-${kernel}-${type}" + _conf="${scriptdir}/${_build}.conf" + source_config || return 0 + case ${arch} in + amd64) + ;; + *) + return 0 + ;; + esac + if [ -z "${GCE_LOGIN_SKIP}" -o -z "${GCE_BUCKET}" ]; then + return 0 + fi + info "Uploading GCE virutal machine image for build: ${_build}" + if [ ! -d "${CHROOTDIR}/${GCE_CONFIG_DIR}" ]; then + if [ ! -e "${GCE_CONFIG_PKG}" ]; then + echo "Cannot locate config tarball." + return 0 + fi + mkdir -p ${CHROOTDIR}/${GCE_CONFIG_LOC} + tar -xzf ${GCE_CONFIG_PKG} -C ${CHROOTDIR}/${GCE_CONFIG_LOC} + fi + mount -t devfs devfs ${CHROOTDIR}/dev + chroot ${CHROOTDIR} make -C /usr/src/release \ + GCE_BUCKET=${GCE_BUCKET} \ + GCE_LOGIN_SKIP=1 \ + gce-upload \ + >> ${logdir}/${_build}.gce 2>&1 + unset _build _conf GCE_BUCKET GCE_CONFIG_DIR GCE_CONFIG_PKG + unset GCE_CONFIG_LOC GCE_LOGIN_SKIP + umount ${CHROOTDIR}/dev + return 0 +} # upload_gce_image() + # Install amd64/i386 "seed" chroots for all branches being built. install_chroots() { source_config || return 0 @@ -486,6 +556,8 @@ main() { runall build_release runall upload_ec2_ami runall upload_azure_image + runall upload_gce_image + runall upload_vagrant_image } main "$@"