From 243462102ecda60719003d196e7bcfe0d0a6b281 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 5 Mar 2024 08:04:13 -0800
Subject: [PATCH] buildkite: build images in parallel

---
 .buildkite/pipeline.yaml | 4 ++--
 .buildkite/release.yaml  | 4 ++--
 tools/images.mk          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 8af8953df..9348d6a14 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -215,13 +215,13 @@ steps:
   - <<: *common
     label: ":docker: Images (x86_64)"
     if: build.env("SKIP_LOADING_IMAGES") == null && build.env("STAGED_BINARIES") == null
-    command: make ARCH=x86_64 load-all-test-images
+    command: make ARCH=x86_64 -j 8 load-all-test-images
     agents:
       arch: "amd64"
   - <<: *common
     label: ":docker: Images (aarch64)"
     if: build.env("SKIP_LOADING_IMAGES") == null && build.env("STAGED_BINARIES") == null
-    command: make ARCH=aarch64 load-all-test-images
+    command: make ARCH=aarch64 -j 8 load-all-test-images
     agents:
       arch: "arm64"
 
diff --git a/.buildkite/release.yaml b/.buildkite/release.yaml
index f8c0217ca..a61ae4f57 100644
--- a/.buildkite/release.yaml
+++ b/.buildkite/release.yaml
@@ -23,14 +23,14 @@ steps:
     label: ":ship: Push all images (x86_64)"
     if: build.branch == "master" && build.tag == null
     commands:
-      - make ARCH=x86_64 push-all-images
+      - make -j 8 ARCH=x86_64 push-all-images
     agents:
       arch: "amd64"
   - <<: *common
     label: ":ship: Push all images (aarch64)"
     if: build.branch == "master" && build.tag == null
     commands:
-      - make ARCH=aarch64 push-all-images
+      - make -j 8 ARCH=aarch64 push-all-images
     agents:
       arch: "arm64"
   - <<: *common
diff --git a/tools/images.mk b/tools/images.mk
index bcd4474b9..dcd45c629 100644
--- a/tools/images.mk
+++ b/tools/images.mk
@@ -132,7 +132,7 @@ tag-%: ## Tag a local image.
 # pull forces the image to be pulled.
 pull = \
   $(call header,PULL $(1)) && \
-  docker pull $(DOCKER_PLATFORM_ARGS) $(call remote_image,$(1)):$(call tag,$(1)) >&2 && \
+  docker pull -q $(DOCKER_PLATFORM_ARGS) $(call remote_image,$(1)):$(call tag,$(1)) >&2 && \
   $(call local_tag,$(1)) && \
   $(call latest_tag,$(1))
 pull-%: register-cross ## Force a repull of the image.
@@ -167,7 +167,7 @@ load-%: register-cross ## Pull or build an image locally.
 # already exists) or building manually. Note that this generic rule will match
 # the fully-expanded remote image tag.
 push-%: load-% ## Push a given image.
-	@docker image push $(call remote_image,$*):$(call tag,$*) >&2
+	@docker image push -q $(call remote_image,$*):$(call tag,$*) >&2
 
 # register-cross registers the necessary qemu binaries for cross-compilation.
 # This may be used by any target that may execute containers that are not the