dashboard: remove OS X 10.10 builders
OS X 10.10 is no longer supported by the latest versions
of Go (1.13 and 1.14). It is no longer in use.
Fixes golang/go#37713
Change-Id: Ibc4a527c17f2dafd00ee0fba2e312394e1ceac9c
Reviewed-on: https://go-review.googlesource.com/c/build/+/222337
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/cmd/buildlet/stage0/Makefile b/cmd/buildlet/stage0/Makefile
index ad95a63..cc236a3 100644
--- a/cmd/buildlet/stage0/Makefile
+++ b/cmd/buildlet/stage0/Makefile
@@ -66,14 +66,10 @@
go install golang.org/x/build/cmd/upload
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet/stage0 --public --cacheable=false go-builder-data/$@
-# macstadium uploads all the darwin-amd64 stage0 binary as three
-# different filenames, which is used by four different Mac VM images.
+# macstadium uploads all the darwin-amd64 stage0 binary as
+# different filenames, which is used by different Mac VM images.
# See the env/darwin/macstadium/** files for details.
-macstadium: run-builder-darwin-10_10.gz run-builder-darwin-10_11.gz
-
-run-builder-darwin-10_10.gz: FORCE
- go install golang.org/x/build/cmd/upload
- upload --verbose --osarch=darwin-amd64 --file=go:golang.org/x/build/cmd/buildlet/stage0 --public --cacheable=false --gzip go-builder-data/$@
+macstadium: run-builder-darwin-10_11.gz
# run-builder-darwin-10_11.gz is used by both our macOS 10.11 and 10.12 VM images.
run-builder-darwin-10_11.gz: FORCE
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 2510d16..d403a1e 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -480,16 +480,6 @@
OwnerGithub: "jordanrh1",
env: []string{"GOROOT_BOOTSTRAP=C:\\Data\\Go"},
},
- "host-darwin-10_10": &HostConfig{
- IsReverse: true,
- ExpectNum: 3,
- Notes: "MacStadium OS X 10.10 VM under VMWare ESXi",
- env: []string{
- "GOROOT_BOOTSTRAP=/Users/gopher/go1.4",
- },
- SSHUsername: "gopher",
- HermeticReverse: false, // TODO: make it so, like 10.12
- },
"host-darwin-10_11": &HostConfig{
IsReverse: true,
ExpectNum: 3,
@@ -502,7 +492,7 @@
},
"host-darwin-10_12": &HostConfig{
IsReverse: true,
- ExpectNum: 3,
+ ExpectNum: 4,
Notes: "MacStadium OS X 10.12 VM under VMWare ESXi",
env: []string{
"GOROOT_BOOTSTRAP=/Users/gopher/go1.4",
@@ -512,7 +502,7 @@
},
"host-darwin-10_14": &HostConfig{
IsReverse: true,
- ExpectNum: 5,
+ ExpectNum: 6,
Notes: "MacStadium macOS Mojave (10.14) VM under VMWare ESXi",
env: []string{
"GOROOT_BOOTSTRAP=/Users/gopher/goboot", // Go 1.12.1
@@ -522,7 +512,7 @@
},
"host-darwin-10_15": &HostConfig{
IsReverse: true,
- ExpectNum: 6,
+ ExpectNum: 7,
Notes: "MacStadium macOS Catalina (10.15) VM under VMWare ESXi",
env: []string{
"GOROOT_BOOTSTRAP=/Users/gopher/goboot", // Go 1.12.1
@@ -2046,17 +2036,6 @@
},
})
addBuilder(BuildConfig{
- Name: "darwin-amd64-10_10",
- HostType: "host-darwin-10_10",
- shouldRunDistTest: macTestPolicy,
- buildsRepo: func(repo, branch, goBranch string) bool {
- // https://tip.golang.org/doc/go1.12 says:
- // "Go 1.12 is the last release that will run on macOS 10.10 Yosemite."
- major, minor, ok := version.ParseReleaseBranch(branch)
- return repo == "go" && ok && major == 1 && minor <= 12
- },
- })
- addBuilder(BuildConfig{
Name: "darwin-amd64-10_11",
HostType: "host-darwin-10_11",
tryBot: nil, // disabled until Macs fixed; https://golang.org/issue/23859
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 4ae7202..39e0339 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -523,8 +523,6 @@
{b("darwin-amd64-10_14", "go"), onlyPost},
{b("darwin-amd64-10_12", "go"), onlyPost},
{b("darwin-amd64-10_11", "go"), onlyPost},
- {b("darwin-amd64-10_10", "go"), none},
- {b("darwin-amd64-10_10@go1.12", "go"), onlyPost},
{b("darwin-386-10_14", "go"), onlyPost},
{b("darwin-386-10_14@go1.12", "go"), none},
{b("darwin-386-10_14@go1.13", "go"), onlyPost},
@@ -630,7 +628,6 @@
{"linux-amd64", "reboot", tryMode, true},
{"linux-amd64-race", "reboot", tryMode, false},
- {"darwin-amd64-10_10", "test:foo", postSubmit, false},
{"darwin-amd64-10_11", "test:foo", postSubmit, false},
{"darwin-amd64-10_12", "test:foo", postSubmit, false},
{"darwin-amd64-10_14", "test:foo", postSubmit, false},
diff --git a/env/darwin/macstadium/10_10/Makefile b/env/darwin/macstadium/10_10/Makefile
deleted file mode 100644
index e5d6115..0000000
--- a/env/darwin/macstadium/10_10/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-usage: FORCE
- # See Makefile targets.
- exit 1
-
-FORCE:
-
-upload: FORCE
- go install golang.org/x/build/cmd/upload
- upload --verbose --gzip --file=run-builder-darwin-10_10.sh -cacheable=false -public=true go-builder-data/run-builder-darwin-10_10.gz
-
diff --git a/env/darwin/macstadium/10_10/stage0.sh b/env/darwin/macstadium/10_10/stage0.sh
deleted file mode 100755
index 7380c53..0000000
--- a/env/darwin/macstadium/10_10/stage0.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# This is the file baked into the OS X 10.10 VM image.
-#
-# Normally our VMs & containers actually have the cmd/buildlet/stage0
-# binary baked-in, but the Mac VM images are extra painful to
-# configure, so there's an extra level of indirection in their boot
-# process to give us this point of flexibility. This shell script then
-# downloads run-builder-darwin-10_10.gz which is the cmd/buildlet/stage0
-# binary, compressed.
-
-set -e
-url="https://storage.googleapis.com/go-builder-data/run-builder-darwin-10_10.gz"
-while ! curl -f -o run-builder.gz "$url"; do
- echo
- echo "curl failed to fetch $url"
- echo "Sleeping before retrying..."
- sleep 2
-done
-
-set -x
-gunzip -f run-builder.gz
-chmod +x run-builder
-exec ./run-builder
