commit 7a18532a4fdc81a735284a3bcaa265358356a600
author Philipp Wollermann <philipp.wollermann@gmail.com> Sat May 18 22:15:48 2019 +0200
committer Philipp Wollermann <philipp.wollermann@gmail.com> Sat May 18 22:15:48 2019 +0200
tree e6d3c1496458bd6b1eff6b001d807b872e0c53e4
parent c52e26af2aa95a97e39096cb8aad3d4a42b8a38c

Replace "kind" with "queue" to select agents.

buildkite/bazelci.py

diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index 2f2b82a..5fdb173 100755
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -361,6 +361,7 @@
         "emoji-name": ":darwin: (OpenJDK 8)",
         "downstream-root": "/Users/buildkite/builds/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": True,
+        "queue": "macos",
         "python": "python3.7",
     },
     "windows": {
@@ -368,6 +369,7 @@
         "emoji-name": ":windows: (OpenJDK 8)",
         "downstream-root": "d:/b/${BUILDKITE_AGENT_NAME}/${BUILDKITE_ORGANIZATION_SLUG}-downstream-projects",
         "publish_binary": True,
+        "queue": "windows",
         "python": "python.exe",
     },
     "rbe_ubuntu1604": {
@@ -1507,20 +1509,13 @@
     return subprocess.Popen(args, env=os.environ)
 
 
-def create_step(label, commands, platform=DEFAULT_PLATFORM, shards=1):
+def create_step(label, commands, platform, shards=1):
     if "docker-image" in PLATFORMS[platform]:
         step = create_docker_step(
             label, image=PLATFORMS[platform]["docker-image"], commands=commands
         )
     else:
-        step = {
-            "label": label,
-            "command": commands,
-            "agents": {
-                "kind": "worker",
-                "os": rchop(host_platform, "_nojava", "_java8", "_java9", "_java10", "_java11"),
-            },
-        }
+        step = {"label": label, "command": commands, "agents": {"queue": platform["queue"]}}
 
     if shards > 1:
         step["label"] += " (shard %n)"
@@ -1537,7 +1532,7 @@
     step = {
         "label": label,
         "command": commands,
-        "agents": {"kind": "docker", "os": "linux"},
+        "agents": {"queue": "linux-docker"},
         "plugins": {
             "docker#v3.2.0": {
                 "always-pull": True,
@@ -1682,6 +1677,7 @@
                     PLATFORMS[DEFAULT_PLATFORM]["python"]
                     + " bazelci.py try_update_last_green_commit",
                 ],
+                platform=DEFAULT_PLATFORM,
             )
         )
 
@@ -1707,7 +1703,6 @@
         for l in output.split("\n")
         if l.startswith(".bazelci/") and os.path.splitext(l)[1] in CONFIG_FILE_EXTENSIONS
     ]
-    platform = DEFAULT_PLATFORM
     return [
         create_step(
             label=":cop: Validate {}".format(f),
@@ -1717,7 +1712,7 @@
                     PLATFORMS[DEFAULT_PLATFORM]["python"], f
                 ),
             ],
-            platform=platform,
+            platform=DEFAULT_PLATFORM,
         )
         for f in config_files
     ]
@@ -1763,6 +1758,7 @@
         commands=[
             'buildkite-agent annotate --append --style={} --context "omg" "{}"'.format(style, text)
         ],
+        platform=DEFAULT_PLATFORM,
     )
 
 
@@ -1837,6 +1833,7 @@
     return create_step(
         label="Setup {0}".format(project_name),
         commands=[fetch_bazelcipy_command(), pipeline_command],
+        platform=DEFAULT_PLATFORM,
     )
 
 
@@ -1945,7 +1942,11 @@
         for s, t in annotations
     ]
     pipeline_steps.append(
-        create_step(label=":pipeline: Print information about skipped tasks", commands=commands)
+        create_step(
+            label=":pipeline: Print information about skipped tasks",
+            commands=commands,
+            platform=DEFAULT_PLATFORM,
+        )
     )
 
 
@@ -1996,6 +1997,7 @@
                 fetch_bazelcipy_command(),
                 PLATFORMS[DEFAULT_PLATFORM]["python"] + " bazelci.py publish_binaries",
             ],
+            platform=DEFAULT_PLATFORM,
         )
     )
 
@@ -2023,6 +2025,7 @@
         commands=[
             'buildkite-agent annotate --append --style=info "\n' + "\n".join(info_text) + '\n"'
         ],
+        platform=DEFAULT_PLATFORM,
     )
 
 
@@ -2039,6 +2042,7 @@
         commands=[
             'buildkite-agent annotate --append --style=info "\n' + "\n".join(info_text) + '\n"'
         ],
+        platform=DEFAULT_PLATFORM,
     )
 
 
@@ -2164,6 +2168,7 @@
                         + " aggregate_incompatible_flags_test_result.py --build_number=%s"
                         % current_build_number,
                     ],
+                    platform=DEFAULT_PLATFORM,
                 )
             )
         else:
@@ -2178,6 +2183,7 @@
                         + " incompatible_flag_verbose_failures.py --build_number=%s | buildkite-agent pipeline upload"
                         % current_build_number,
                     ],
+                    platform=DEFAULT_PLATFORM,
                 )
             )
 
@@ -2196,6 +2202,7 @@
                     PLATFORMS[DEFAULT_PLATFORM]["python"]
                     + " bazelci.py try_update_last_green_downstream_commit",
                 ],
+                platform=DEFAULT_PLATFORM,
             )
         )