cmd/release: stop using scaleway for linux-arm
The Scaleway hosts are in the process of being deprecated. This
removes the use of Scaleway for releases. The linux-arm-aws builders
will be used during the release for Linux ARM packages.
Updates golang/go#45066
Change-Id: I1a24917d48c36f8820845689636b4b718a7dc0a5
Reviewed-on: https://go-review.googlesource.com/c/build/+/325693
Trust: Carlos Amedee <carlos@golang.org>
Run-TryBot: Carlos Amedee <carlos@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Reviewed-by: Alexander Rakoczy <alex@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/cmd/release/release.go b/cmd/release/release.go
index c6ab9cc..39710eb 100644
--- a/cmd/release/release.go
+++ b/cmd/release/release.go
@@ -158,7 +158,6 @@
Builder: "linux-386-stretch",
},
{
- GoQuery: ">= go1.16beta1",
OS: "linux",
Arch: "arm",
Builder: "linux-arm-aws",
@@ -253,16 +252,6 @@
{
GoQuery: "< go1.16beta1",
OS: "linux",
- Arch: "arm",
- Builder: "linux-arm-scaleway",
- Goarm: 6, // For compatibility with all Raspberry Pi models.
- // The tests take too long for the release packaging.
- // Much of the time the whole buildlet times out.
- SkipTests: true,
- },
- {
- GoQuery: "< go1.16beta1",
- OS: "linux",
Arch: "amd64",
Race: true,
Builder: "linux-amd64-jessie", // Using Jessie for Go 1.11 through Go 1.15 inclusive due to golang.org/issue/31293.
diff --git a/cmd/release/release_test.go b/cmd/release/release_test.go
index bd982c1..7b31b40 100644
--- a/cmd/release/release_test.go
+++ b/cmd/release/release_test.go
@@ -88,9 +88,8 @@
{"go1.16", "linux-amd64", "linux-amd64-stretch"},
{"go1.16", "linux-386", "linux-386-stretch"},
- // Go 1.15.x still uses the Packet and Scaleway builders.
- {"go1.15.55", "linux-armv6l", "linux-arm-scaleway"},
- // Go 1.16 starts to use the the AWS builders.
+ // Go 1.16 and Go 1.15.14 start to use the the AWS builders.
+ {"go1.15.55", "linux-armv6l", "linux-arm-aws"}, // used as of golang.org/issue/45066
{"go1.16", "linux-arm64", "linux-arm64-aws"},
{"go1.16", "linux-armv6l", "linux-arm-aws"},
