diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-08-05 19:00:45 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-08-05 19:00:45 +0000 |
| commit | c63ea09b5c0dd42b4c8a77a5ae495f28916af978 (patch) | |
| tree | 0dbb4693377b31ec3cace8e31fe9ab150b80bea6 /release/Makefile.gce | |
| parent | 921d7118e10dc42b246504e8991d54917027efd5 (diff) | |
| download | src-test2-c63ea09b5c0dd42b4c8a77a5ae495f28916af978.tar.gz src-test2-c63ea09b5c0dd42b4c8a77a5ae495f28916af978.zip | |
Fix GCE image publication. The gcutil utility is deprecated in favor
of gcloud.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=303782
Diffstat (limited to 'release/Makefile.gce')
| -rw-r--r-- | release/Makefile.gce | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile.gce b/release/Makefile.gce index b6b6577cc7bd..5bdfb5d2ce62 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -35,7 +35,7 @@ gce-check-depends: @false . endif .endfor -.if !exists(/usr/local/bin/gcutil) +.if !exists(/usr/local/bin/gcloud) . if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile) . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf @@ -63,7 +63,7 @@ gce-do-upload: /usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ gs://${GCE_BUCKET}/ - /usr/local/bin/gcutil addimage ${GCE_TARGET} \ - gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz + /usr/local/bin/gcloud compute images create ${GCE_TARGET} \ + --source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz touch ${.OBJDIR}/${.TARGET} |