Fix make_dummy_staging_tasks to break bot ranges up to avoid zero pad errors
Bug: skia:
Change-Id: I4679715b3298cb289792fbc4079962397fd7dcb5
Reviewed-on: https://skia-review.googlesource.com/c/184880
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
diff --git a/scripts/make_dummy_staging_tasks/make_dummy_staging_tasks.go b/scripts/make_dummy_staging_tasks/make_dummy_staging_tasks.go
index 1d6fced..5851392 100644
--- a/scripts/make_dummy_staging_tasks/make_dummy_staging_tasks.go
+++ b/scripts/make_dummy_staging_tasks/make_dummy_staging_tasks.go
@@ -216,7 +216,8 @@
setKeys = append(setKeys, key)
}
sort.Strings(setKeys)
- numBots := 0
+ botIdStart := 100 // To avoid issues with zero-padding.
+ rangeStart := botIdStart
botCfgData := ""
for _, setKey := range setKeys {
bots := canHandle[setKey]
@@ -224,16 +225,16 @@
for _, dimSet := range strings.Split(setKey, ",") {
dimensions += fmt.Sprintf(" dimensions: \"%s\"\n", fmt.Sprintf(BOT_GROUP_TMPL, dimSet))
}
- rangeStr := fmt.Sprintf("{%03d..%03d}", numBots, numBots+len(bots)-1)
+ rangeStr := fmt.Sprintf("{%03d..%03d}", rangeStart, rangeStart+len(bots)-1)
if len(bots) == 1 {
- rangeStr = fmt.Sprintf("%03d", numBots)
+ rangeStr = fmt.Sprintf("%03d", rangeStart)
}
botSection := fmt.Sprintf(BOT_SECTION_TMPL, fmt.Sprintf(BOT_NAME_TMPL, rangeStr), dimensions)
botCfgData += botSection
- numBots += len(bots)
+ rangeStart += len(bots)
}
if err := ioutil.WriteFile(*botsCfg, []byte(botCfgData), os.ModePerm); err != nil {
sklog.Fatal(err)
}
- sklog.Infof("Create bots with:\n$ go run ./go/gce/swarming/swarming_vm.go --logtostderr --dev --create --machine-type=f1-micro --data-disk-size=10 --instances=0-%d", numBots)
+ sklog.Infof("Create bots with:\n$ go run ./go/gce/swarming/swarming_vm.go --logtostderr --dev --create --machine-type=f1-micro --data-disk-size=10 --instances=%d-%d", botIdStart, rangeStart-1)
}
