From c6e40201df7b1d87a26088fc1fde12431d89338e Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 2 Jan 2015 18:19:51 -0800 Subject: [PATCH] env/openbsd-amd64: install git, improve README Updates golang/go#8642 Change-Id: Ia11faeafb96a325ff62dcf95fedb5a6489e41bd4 Reviewed-on: https://go-review.googlesource.com/2263 Reviewed-by: Minux Ma --- env/openbsd-amd64/README | 6 ++++-- env/openbsd-amd64/make.bash | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/env/openbsd-amd64/README b/env/openbsd-amd64/README index 0a3871a1f6..f54a076c8d 100644 --- a/env/openbsd-amd64/README +++ b/env/openbsd-amd64/README @@ -5,11 +5,13 @@ make.bash should be run on a Linux box with qemu. After it completes, it creates a file openbsd-amd64-gce.tar.gz -Upload openbsd-amd64-gce.tar.gz to gs://go-builder-data/openbsd-amd64-gce.tar.gz -I just use the web UI at: +Then: + gsutil cp -a public-read openbsd-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-gce.tar.gz +Or just use the web UI at: https://console.developers.google.com/project/symbolic-datum-552/storage/browser/go-builder-data/ Then: + gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-56 gcloud compute --project symbolic-datum-552 images create openbsd-amd64-56 --source-uri gs://go-builder-data/openbsd-amd64-gce.tar.gz The VM needs to be run with the GCE metadata attribute "buildlet-binary-url" set to a URL diff --git a/env/openbsd-amd64/make.bash b/env/openbsd-amd64/make.bash index dee7ad6af4..9ed91cdf4a 100755 --- a/env/openbsd-amd64/make.bash +++ b/env/openbsd-amd64/make.bash @@ -17,7 +17,7 @@ fi mkdir -p etc cat >install.site <> /etc/dhclient.conf @@ -202,7 +202,10 @@ send "yes\n" expect -timeout 600 "Location of sets\?" send "done\n" -# Need to wait for install.site to install curl. +expect "Ambiguous: choose dependency for git" +send "0\n" + +# Need to wait for install.site to install curl, git, et expect -timeout 600 "CONGRATULATIONS!" expect "# "