Skip to content

Commit 1a31fad

Browse files
committed
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 <[email protected]> Run-TryBot: Carlos Amedee <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Heschi Kreinick <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 6049668 commit 1a31fad

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

cmd/release/release.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ var builds = []*Build{
158158
Builder: "linux-386-stretch",
159159
},
160160
{
161-
GoQuery: ">= go1.16beta1",
162161
OS: "linux",
163162
Arch: "arm",
164163
Builder: "linux-arm-aws",
@@ -250,16 +249,6 @@ var builds = []*Build{
250249
Arch: "386",
251250
Builder: "linux-386-jessie",
252251
},
253-
{
254-
GoQuery: "< go1.16beta1",
255-
OS: "linux",
256-
Arch: "arm",
257-
Builder: "linux-arm-scaleway",
258-
Goarm: 6, // For compatibility with all Raspberry Pi models.
259-
// The tests take too long for the release packaging.
260-
// Much of the time the whole buildlet times out.
261-
SkipTests: true,
262-
},
263252
{
264253
GoQuery: "< go1.16beta1",
265254
OS: "linux",

cmd/release/release_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,8 @@ func TestBuilderSelectionPerGoVersion(t *testing.T) {
8888
{"go1.16", "linux-amd64", "linux-amd64-stretch"},
8989
{"go1.16", "linux-386", "linux-386-stretch"},
9090

91-
// Go 1.15.x still uses the Packet and Scaleway builders.
92-
{"go1.15.55", "linux-armv6l", "linux-arm-scaleway"},
93-
// Go 1.16 starts to use the the AWS builders.
91+
// Go 1.16 and Go 1.15.14 start to use the the AWS builders.
92+
{"go1.15.55", "linux-armv6l", "linux-arm-aws"}, // used as of golang.org/issue/45066
9493
{"go1.16", "linux-arm64", "linux-arm64-aws"},
9594
{"go1.16", "linux-armv6l", "linux-arm-aws"},
9695

0 commit comments

Comments
 (0)