go
/
build
зеркало из https://github.com/golang/build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

dashboard: stop running Linux builders 

Stop running the Linux builders that have been ported to LUCI.
Update some tests so it's viable not to delete them yet.

For golang/go#67761.

Change-Id: Iec53744970f478a63ec6792c3f46d49b17938ec6
Reviewed-on: https://go-review.googlesource.com/c/build/+/589661
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Dmitri Shuralyov 2024-05-31 19:49:04 -04:00 коммит произвёл Gopher Robot
Родитель 14f081db4d
Коммит 5dfbda4383
4 изменённых файлов: 72 добавлений и 52 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
cmd/coordinator/coordinator_test.go
Просмотреть файл

@ -225,8 +225,8 @@ func TestXRepoBranches(t *testing.T) {
v := bs.NameAndBranch()
t.Logf("build[%d]: %s", i, v)
}
if len(ts.builds) < 3 {
t.Fatalf("expected at least 3 builders, got %v", len(ts.builds))
if len(ts.builds) == 0 {
t.Fatal("no builders in try set, want at least 1")
}
}

10
cmd/coordinator/internal/legacydash/ui_test.go
Просмотреть файл

@ -25,8 +25,14 @@ func TestUITemplateDataBuilder(t *testing.T) {
origBuilders := dashboard.Builders
defer func() { dashboard.Builders = origBuilders }()
dashboard.Builders = map[string]*dashboard.BuildConfig{
"linux-amd64": origBuilders["linux-amd64"],
"linux-386": origBuilders["linux-386"],
"linux-amd64": {
Name: "linux-amd64",
HostType: "host-linux-amd64-bullseye",
},
"linux-386": {
Name: "linux-386",
HostType: "host-linux-amd64-bullseye",
},
}
tests := []struct {

109
dashboard/builders_test.go
Просмотреть файл

@ -93,12 +93,13 @@ func TestTrybots(t *testing.T) {
branch: "master",
want: []string{
"freebsd-amd64-12_3",
"linux-386",
"linux-amd64",
"linux-amd64-boringcrypto",
"linux-amd64-newinliner",
"linux-amd64-race",
"linux-arm64",
// Stopped.
//"linux-386",
//"linux-amd64",
//"linux-amd64-boringcrypto",
//"linux-amd64-newinliner",
//"linux-amd64-race",
//"linux-arm64",
"openbsd-amd64-72",
// Stopped.
//"windows-386-2016",
@ -110,21 +111,22 @@ func TestTrybots(t *testing.T) {
branch: "release-branch.go1.22",
want: []string{
"freebsd-amd64-12_3",
"linux-386",
"linux-amd64",
"linux-amd64-boringcrypto",
"linux-amd64-race",
"linux-arm64",
// Stopped.
//"linux-386",
//"linux-amd64",
//"linux-amd64-boringcrypto",
//"linux-amd64-race",
//"linux-arm64",
"openbsd-amd64-72",
// Stopped.
//"windows-386-2016",
//"windows-amd64-2016",
// Include longtest builders on Go repo release branches. See issue 37827.
"linux-386-longtest",
"linux-amd64-longtest",
"linux-arm64-longtest",
// Stopped.
//"linux-386-longtest",
//"linux-amd64-longtest",
//"linux-arm64-longtest",
//"windows-amd64-longtest",
},
},
@ -133,21 +135,22 @@ func TestTrybots(t *testing.T) {
branch: "release-branch.go1.21",
want: []string{
"freebsd-amd64-12_3",
"linux-386",
"linux-amd64",
"linux-amd64-boringcrypto",
"linux-amd64-race",
"linux-arm64",
// Stopped.
//"linux-386",
//"linux-amd64",
//"linux-amd64-boringcrypto",
//"linux-amd64-race",
//"linux-arm64",
"openbsd-amd64-72",
// Stopped.
//"windows-386-2016",
//"windows-amd64-2016",
// Include longtest builders on Go repo release branches. See issue 37827.
"linux-386-longtest",
"linux-amd64-longtest",
"linux-arm64-longtest",
// Stopped.
//"linux-386-longtest",
//"linux-amd64-longtest",
//"linux-arm64-longtest",
//"windows-amd64-longtest",
},
},
@ -157,8 +160,9 @@ func TestTrybots(t *testing.T) {
want: []string{
"android-amd64-emu",
"linux-amd64-androidemu",
"linux-amd64",
"linux-amd64-race",
// Stopped.
//"linux-amd64",
//"linux-amd64-race",
},
},
{
@ -168,11 +172,12 @@ func TestTrybots(t *testing.T) {
"freebsd-386-13_0",
"freebsd-amd64-12_3",
"freebsd-amd64-13_0",
"linux-386",
"linux-amd64",
"linux-amd64-boringcrypto", // GoDeps will exclude, but not in test
"linux-amd64-race",
"linux-arm64",
// Stopped.
//"linux-386",
//"linux-amd64",
//"linux-amd64-boringcrypto", // GoDeps will exclude, but not in test
//"linux-amd64-race",
//"linux-arm64",
"netbsd-amd64-9_3",
"openbsd-386-72",
"openbsd-amd64-72",
@ -184,27 +189,29 @@ func TestTrybots(t *testing.T) {
{
repo: "exp",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-race",
want: []string{
// Stopped.
//"linux-amd64",
//"linux-amd64-race",
//"windows-amd64-2016",
},
},
{
repo: "vulndb",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-race",
want: []string{
// Stopped.
//"linux-amd64",
//"linux-amd64-race",
},
},
{
repo: "website",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-race",
want: []string{
// Stopped.
//"linux-amd64",
//"linux-amd64-race",
},
},
}
@ -256,21 +263,23 @@ func TestPostSubmit(t *testing.T) {
{
repo: "vulndb",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-longtest",
"linux-amd64-race",
"linux-amd64-longtest-race",
want: []string{
// Stopped.
//"linux-amd64",
//"linux-amd64-longtest",
//"linux-amd64-race",
//"linux-amd64-longtest-race",
},
},
{
repo: "website",
branch: "master",
want: []string{
"linux-amd64",
"linux-amd64-longtest",
"linux-amd64-race",
"linux-amd64-longtest-race",
want: []string{
// Stopped.
//"linux-amd64",
//"linux-amd64-longtest",
//"linux-amd64-race",
//"linux-amd64-longtest-race",
},
},
}
@ -731,6 +740,10 @@ func TestBuildsRepoAtAllImplicitGoBranch(t *testing.T) {
}
func TestShouldRunDistTest(t *testing.T) {
if stopped := migration.BuildersPortedToLUCI["linux-amd64"] && migration.StopPortedBuilder("linux-amd64"); stopped {
t.Skip("test can't be used because linux builders are stopped")
}
type buildMode int
const (
tryMode buildMode = 0

1
internal/migration/migration.go
Просмотреть файл

@ -91,6 +91,7 @@ var BuildersPortedToLUCI = map[string]bool{
func StopPortedBuilder(builderName string) (stop bool) {
nameKeyList := []string{
"darwin-",
"linux-",
"windows-",
"linux-loong64",
"linux-ppc64",