dashboard/config/openbsd: fixes for recreate script

2 files changed, 9 insertions, 9 deletions

diff --git a/dashboard/config/openbsd/recreate.sh b/dashboard/config/openbsd/recreate.sh
index d0d18dd80..ba68ff7ea 100755
--- a/dashboard/config/openbsd/recreate.sh
+++ b/dashboard/config/openbsd/recreate.sh
@@ -38,7 +38,7 @@ IMAGE="${INSTANCE}"-"${TODAY}"-root
 
 "${SYZ_DIR}"/tools/create-openbsd-gce-ci.sh
 
-gsutil -u syzkaller cp -a public-read openbsd-amd64-snapshot-gce.tar.gz gs://syzkaller/openbsd-amd64-"${TODAY}"-gce.tar.gz
+gcloud storage cp --billing-project=syzkaller --predefined-acl=publicRead openbsd-amd64-snapshot-gce.tar.gz gs://syzkaller/openbsd-amd64-"${TODAY}"-gce.tar.gz
 
 ssh root@"${HOST}" halt -p || true
 
@@ -71,9 +71,9 @@ mv  ~/.ssh/known_hosts{.new,}
 
 "${SYZ_DIR}"/tools/create-openbsd-vmm-worker.sh
 
-ssh syzkaller@"${HOST}" mkdir -p /syzkaller/userspace
-ssh syzkaller@"${HOST}" ln -sf /syzkaller/{gopath/src/github.com/google/syzkaller/dashboard/,}config
-scp worker_key syzkaller@"${HOST}":/syzkaller/userspace/key
-scp -C worker_disk.raw syzkaller@"${HOST}":/syzkaller/userspace/image
-ssh syzkaller@"${HOST}" 'D=/syzkaller/userspace-multicore && mkdir -p $D && ln -sf ../userspace/{image,key} $D && ln -sf ../config/openbsd/overlays/ci-openbsd-multicore $D/overlay'
-ssh root@"${HOST}" reboot
+ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no syzkaller@"${HOST}" mkdir -p /syzkaller/userspace
+ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no syzkaller@"${HOST}" ln -sf /syzkaller/{gopath/src/github.com/google/syzkaller/dashboard/,}config
+scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no worker_key syzkaller@"${HOST}":/syzkaller/userspace/key
+scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -C worker_disk.raw syzkaller@"${HOST}":/syzkaller/userspace/image
+ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no syzkaller@"${HOST}" 'D=/syzkaller/userspace-multicore && mkdir -p $D && ln -sf ../userspace/{image,key} $D && ln -sf ../config/openbsd/overlays/ci-openbsd-multicore $D/overlay'
+ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@"${HOST}" reboot
diff --git a/tools/create-openbsd-gce-ci.sh b/tools/create-openbsd-gce-ci.sh
index a5115e731..8faeca5cf 100755
--- a/tools/create-openbsd-gce-ci.sh
+++ b/tools/create-openbsd-gce-ci.sh
@@ -7,7 +7,7 @@
 
 # Mostly derived from Go buildlet generator with blessing from bradfitz@.
 
-set -eu -o pipefail
+set -eux -o pipefail
 
 readonly MIRROR="${MIRROR:-cdn.openbsd.org}"
 # The only supported setting.
@@ -213,7 +213,7 @@ Done.
 
 To create GCE image run the following commands:
 
-gsutil cp -a public-read "$i" gs://syzkaller/
+gcloud storage cp --billing-project=syzkaller --predefined-acl=publicRead "$i" gs://syzkaller/
 gcloud compute images create ci-openbsd-root --source-uri gs://syzkaller/"$i"
 
 EOF