[infra] Roll infra DEPS, update CIPD packages

Change-Id: Ie20d7db4646851e8baaefbe134f2c273b97f7c54
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/342298
Reviewed-by: Weston Tracey <westont@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/go.mod b/go.mod
index 3f4fc71..3b65132d 100644
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,7 @@
 	github.com/vektra/mockery v1.1.2 // indirect
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
-	go.skia.org/infra v0.0.0-20201207203943-872c83842f7f
+	go.skia.org/infra v0.0.0-20201208190233-5ff1df349fce
 	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
 	golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect
 	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
diff --git a/go.sum b/go.sum
index a0c64fe..9d90f07 100644
--- a/go.sum
+++ b/go.sum
@@ -1540,6 +1540,8 @@
 go.skia.org/infra v0.0.0-20201124180436-e5c4a9cfc497/go.mod h1:oFkIcc1CyrdaKdUCEdzTaEYrZ5VQilTafssIyqmDX5c=
 go.skia.org/infra v0.0.0-20201207203943-872c83842f7f h1:YYw8uJAhrDhZEeADqP1VRIhGwbXLc85CAbRssIRn3po=
 go.skia.org/infra v0.0.0-20201207203943-872c83842f7f/go.mod h1:Y9eqtwoOyMrt8v6BhHkKeowb5NtwW0QS7acq62C5hYA=
+go.skia.org/infra v0.0.0-20201208190233-5ff1df349fce h1:33k5qh7TbSOoR7v66BL0mXem4dgepFY/aEbhWDoNUA8=
+go.skia.org/infra v0.0.0-20201208190233-5ff1df349fce/go.mod h1:Y9eqtwoOyMrt8v6BhHkKeowb5NtwW0QS7acq62C5hYA=
 go.starlark.net v0.0.0-20201118183435-e55f603d8c79/go.mod h1:5YFcFnRptTN+41758c2bMPiqpGg4zBfYji1IQz8wNFk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index cb7fd5e..02f3b2e 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -116,9 +116,7 @@
 	}
 
 	// TODO(borenet): This hacky and bad.
-	CIPD_PKG_LUCI_AUTH = specs.CIPD_PKGS_KITCHEN[1]
-	CIPD_PKGS_KITCHEN  = append(specs.CIPD_PKGS_KITCHEN[:2], specs.CIPD_PKGS_PYTHON[1])
-	CIPD_PKG_CPYTHON   = specs.CIPD_PKGS_PYTHON[0]
+	CIPD_PKG_LUCI_AUTH = cipd.MustGetPackage("infra/tools/luci-auth/${platform}")
 
 	CIPD_PKGS_GOLDCTL = []*specs.CipdPackage{cipd.MustGetPackage("skia/tools/goldctl/${platform}")}
 
@@ -378,7 +376,8 @@
 // kitchenTaskNoBundle sets up the task to run a recipe via Kitchen, without the
 // recipe bundle.
 func (b *taskBuilder) kitchenTaskNoBundle(recipe string, outputDir string) {
-	b.cipd(CIPD_PKGS_KITCHEN...)
+	b.cipd(CIPD_PKG_LUCI_AUTH)
+	b.cipd(cipd.MustGetPackage("infra/tools/luci/kitchen/${platform}"))
 	b.usesPython()
 	b.recipeProp("swarm_out_dir", outputDir)
 	if outputDir != OUTPUT_NONE {
@@ -793,7 +792,7 @@
 func (b *jobBuilder) bundleRecipes() string {
 	b.addTask(BUNDLE_RECIPES_NAME, func(b *taskBuilder) {
 		b.cipd(specs.CIPD_PKGS_GIT_LINUX_AMD64...)
-		b.cipd(specs.CIPD_PKGS_PYTHON...)
+		b.cipd(specs.CIPD_PKGS_PYTHON_LINUX_AMD64...)
 		b.cmd("/bin/bash", "skia/infra/bots/bundle_recipes.sh", specs.PLACEHOLDER_ISOLATED_OUTDIR)
 		b.linuxGceDimensions(MACHINE_TYPE_SMALL)
 		b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin")
diff --git a/infra/bots/gen_tasks_logic/task_builder.go b/infra/bots/gen_tasks_logic/task_builder.go
index fafdb55..ac69118 100644
--- a/infra/bots/gen_tasks_logic/task_builder.go
+++ b/infra/bots/gen_tasks_logic/task_builder.go
@@ -8,6 +8,7 @@
 	"reflect"
 	"time"
 
+	"go.skia.org/infra/go/cipd"
 	"go.skia.org/infra/task_scheduler/go/specs"
 )
 
@@ -259,15 +260,37 @@
 	return marshalJson(props)
 }
 
+// cipdPlatform returns the CIPD platform for this task.
+func (b *taskBuilder) cipdPlatform() string {
+	if b.role("Upload") {
+		return cipd.PlatformLinuxAmd64
+	} else if b.matchOs("Win") || b.matchExtraConfig("Win") {
+		if b.matchArch("x86_64") {
+			return cipd.PlatformWindowsAmd64
+		} else {
+			return cipd.PlatformWindows386
+		}
+	} else if b.matchOs("Mac") {
+		return cipd.PlatformMacAmd64
+	} else if b.matchArch("Arm64") {
+		return cipd.PlatformLinuxArm64
+	} else {
+		return cipd.PlatformLinuxAmd64
+	}
+}
+
 // usesPython adds attributes to tasks which use python.
 func (b *taskBuilder) usesPython() {
-	// TODO(borenet): This is hacky and bad.
-	b.cipd(specs.CIPD_PKGS_PYTHON[1])
-	if (b.matchOs("Win") || b.matchExtraConfig("Win")) && !b.model("LenovoYogaC630") {
-		b.cipd(CIPD_PKG_CPYTHON)
-	} else if b.os("Mac10.15") && b.model("VMware7.1") {
-		b.cipd(CIPD_PKG_CPYTHON)
+	// TODO(borenet): This handling of the Python package is hacky and bad.
+	pythonPkgs := cipd.PkgsPython[b.cipdPlatform()]
+	b.cipd(pythonPkgs[1])
+	if b.os("Mac10.15") && b.model("VMware7.1") {
+		b.cipd(pythonPkgs[0])
 	}
+	if (b.matchOs("Win") || b.matchExtraConfig("Win")) && !b.model("LenovoYogaC630") {
+		b.cipd(pythonPkgs[0])
+	}
+
 	b.cache(&specs.Cache{
 		Name: "vpython",
 		Path: "cache/vpython",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 099e72e..20008b4 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -11360,7 +11360,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11436,7 +11436,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11512,7 +11512,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11588,7 +11588,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11664,7 +11664,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11739,7 +11739,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11815,7 +11815,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11891,7 +11891,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -11967,7 +11967,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12043,7 +12043,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12119,7 +12119,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12195,7 +12195,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12271,7 +12271,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12347,7 +12347,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12428,7 +12428,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12504,7 +12504,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12580,7 +12580,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12656,7 +12656,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12732,7 +12732,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12808,7 +12808,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12884,7 +12884,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -12960,7 +12960,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13036,7 +13036,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13107,7 +13107,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13178,7 +13178,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13249,7 +13249,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13320,7 +13320,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13391,7 +13391,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13462,7 +13462,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13533,7 +13533,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13604,7 +13604,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13675,7 +13675,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13746,7 +13746,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13817,7 +13817,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13888,7 +13888,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -13959,7 +13959,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -15600,7 +15600,7 @@
     "Housekeeper-PerCommit-BundleRecipes": {
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -16059,7 +16059,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -23589,7 +23589,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -23672,7 +23672,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -23755,7 +23755,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -23838,7 +23838,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -23921,7 +23921,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24004,7 +24004,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24082,7 +24082,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24165,7 +24165,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24243,7 +24243,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24321,7 +24321,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24404,7 +24404,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24487,7 +24487,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24570,7 +24570,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24653,7 +24653,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24736,7 +24736,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24819,7 +24819,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24902,7 +24902,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -24985,7 +24985,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25068,7 +25068,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25151,7 +25151,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25234,7 +25234,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25317,7 +25317,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25400,7 +25400,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25483,7 +25483,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25566,7 +25566,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25649,7 +25649,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25732,7 +25732,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25815,7 +25815,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25898,7 +25898,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -25981,7 +25981,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -26064,7 +26064,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -26148,7 +26148,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -26232,7 +26232,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -41616,9 +41616,9 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages",
-          "version": "version:2.7.18.chromium.30"
+          "version": "version:2.7.18.chromium.29"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
@@ -43445,7 +43445,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -43528,7 +43528,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -43611,7 +43611,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -43694,7 +43694,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -43777,7 +43777,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -43860,7 +43860,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -43943,7 +43943,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44026,7 +44026,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44109,7 +44109,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44192,7 +44192,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44275,7 +44275,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44358,7 +44358,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44441,7 +44441,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44524,7 +44524,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44607,7 +44607,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44695,7 +44695,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44778,7 +44778,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44861,7 +44861,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -44944,7 +44944,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45027,7 +45027,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45110,7 +45110,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45198,7 +45198,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45281,7 +45281,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45364,7 +45364,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45447,7 +45447,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45530,7 +45530,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45613,7 +45613,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45696,7 +45696,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45779,7 +45779,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45862,7 +45862,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -45945,7 +45945,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46028,7 +46028,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46111,7 +46111,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46194,7 +46194,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46277,7 +46277,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46360,7 +46360,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46443,7 +46443,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46526,7 +46526,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46609,7 +46609,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46692,7 +46692,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46775,7 +46775,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46858,7 +46858,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -46941,7 +46941,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47024,7 +47024,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47107,7 +47107,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47190,7 +47190,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47273,7 +47273,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47356,7 +47356,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47439,7 +47439,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47522,7 +47522,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47605,7 +47605,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47688,7 +47688,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47771,7 +47771,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47854,7 +47854,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -47937,7 +47937,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48020,7 +48020,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48103,7 +48103,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48186,7 +48186,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48269,7 +48269,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48352,7 +48352,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48435,7 +48435,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48518,7 +48518,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48601,7 +48601,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48684,7 +48684,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48767,7 +48767,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48850,7 +48850,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -48933,7 +48933,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49016,7 +49016,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49099,7 +49099,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49182,7 +49182,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49265,7 +49265,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49504,7 +49504,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49588,7 +49588,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49672,7 +49672,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49756,7 +49756,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49840,7 +49840,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -49924,7 +49924,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50008,7 +50008,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50092,7 +50092,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50176,7 +50176,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50260,7 +50260,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50344,7 +50344,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50428,7 +50428,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50512,7 +50512,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50596,7 +50596,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50679,7 +50679,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50762,7 +50762,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50845,7 +50845,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -50928,7 +50928,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -51011,7 +51011,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -51094,7 +51094,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -51177,7 +51177,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-386",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -51260,7 +51260,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -51343,7 +51343,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59231,7 +59231,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59303,7 +59303,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59375,7 +59375,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59447,7 +59447,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59519,7 +59519,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59591,7 +59591,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59663,7 +59663,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59735,7 +59735,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59807,7 +59807,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59879,7 +59879,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -59951,7 +59951,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60023,7 +60023,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60095,7 +60095,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60167,7 +60167,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60239,7 +60239,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60311,7 +60311,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60383,7 +60383,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60455,7 +60455,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60527,7 +60527,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60599,7 +60599,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60671,7 +60671,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60743,7 +60743,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60815,7 +60815,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60887,7 +60887,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -60959,7 +60959,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -61031,7 +61031,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -61103,7 +61103,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -61175,7 +61175,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -61247,7 +61247,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -61319,7 +61319,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -61391,7 +61391,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -72116,7 +72116,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -72657,7 +72657,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -72729,7 +72729,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -72801,7 +72801,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -72873,7 +72873,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -72945,7 +72945,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73017,7 +73017,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73089,7 +73089,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73161,7 +73161,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73233,7 +73233,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73305,7 +73305,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73377,7 +73377,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73449,7 +73449,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73521,7 +73521,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73593,7 +73593,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73665,7 +73665,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73737,7 +73737,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73809,7 +73809,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73881,7 +73881,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -73953,7 +73953,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74025,7 +74025,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74097,7 +74097,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74169,7 +74169,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74241,7 +74241,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74313,7 +74313,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74385,7 +74385,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74457,7 +74457,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74529,7 +74529,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74601,7 +74601,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74673,7 +74673,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74745,7 +74745,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74817,7 +74817,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74889,7 +74889,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -74961,7 +74961,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75033,7 +75033,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75105,7 +75105,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75177,7 +75177,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75249,7 +75249,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75321,7 +75321,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75393,7 +75393,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75465,7 +75465,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75537,7 +75537,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75609,7 +75609,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75681,7 +75681,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75753,7 +75753,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75825,7 +75825,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75897,7 +75897,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -75969,7 +75969,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76041,7 +76041,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76113,7 +76113,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76185,7 +76185,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76257,7 +76257,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76329,7 +76329,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76401,7 +76401,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76473,7 +76473,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76545,7 +76545,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76617,7 +76617,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76689,7 +76689,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76761,7 +76761,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76833,7 +76833,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76905,7 +76905,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -76977,7 +76977,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77049,7 +77049,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77121,7 +77121,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77193,7 +77193,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77265,7 +77265,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77337,7 +77337,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77409,7 +77409,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77615,7 +77615,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77687,7 +77687,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77759,7 +77759,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77831,7 +77831,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77903,7 +77903,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -77975,7 +77975,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78047,7 +78047,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78119,7 +78119,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78191,7 +78191,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78263,7 +78263,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78335,7 +78335,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78407,7 +78407,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78479,7 +78479,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78551,7 +78551,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78623,7 +78623,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78695,7 +78695,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78767,7 +78767,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78839,7 +78839,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78911,7 +78911,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -78983,7 +78983,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },
@@ -79055,7 +79055,7 @@
       ],
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/${platform}",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages",
           "version": "version:2.7.18.chromium.30"
         },