svn commit: r331876 - in stable: 10/release 11/release

[Glen Barber]

Author: gjb
Date: Mon Apr  2 13:25:38 2018
New Revision: 331876
URL: https://svnweb.freebsd.org/changeset/base/331876

Log:
  MFC r331806:
   Add logic for "families" for GCE images.
  
   This allows for GCE consumers to easily detect the latest major
   version of FreeBSD when using the gcloud command line utility.
  
   To ensure snapshot builds do not conflict with release-style
   builds (ALPHA, BETA, RC, RELEASE), the '-snap' suffix is appended
   to the GCE image family name.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/Makefile.gce
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/release/Makefile.gce
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/release/Makefile.gce
==============================================================================
--- stable/11/release/Makefile.gce	Mon Apr  2 08:06:18 2018	(r331875)
+++ stable/11/release/Makefile.gce	Mon Apr  2 13:25:38 2018	(r331876)
@@ -18,8 +18,13 @@ CLEANFILES+=		${GCE_UPLOAD_TGTS}
 
 GCE_BUCKET?=
 
+.if !defined(GCE_FAMILY) || empty(GCE_FAMILY)
+GCE_FAMILY=		${TYPE:tl}-${REVISION:S,.,-,}
+.endif
+
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT_DATE!=		date +-%Y-%m-%d
+GCE_FAMILY_SUFX=	-snap
 .endif
 
 # Really?  Uppercase characters are not allowed?  Sigh...
@@ -64,6 +69,7 @@ gce-do-upload:
 	/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
 		gs://${GCE_BUCKET}/
 	/usr/local/bin/gcloud compute images create ${GCE_TARGET} \
+		--family=${GCE_FAMILY}${GCE_FAMILY_SUFX} \
 		--source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
 	touch ${.OBJDIR}/${.TARGET}