From efdf8dd715649b3c47e7c24bafb3cb94bf4de1f8 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Fri, 29 Apr 2022 16:49:03 -0700
Subject: [PATCH] Don't push images or the website on tag builds.

Updates #7327

PiperOrigin-RevId: 445535035
---
 .buildkite/release.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.buildkite/release.yaml b/.buildkite/release.yaml
index b2d4f4023..2221fd915 100644
--- a/.buildkite/release.yaml
+++ b/.buildkite/release.yaml
@@ -9,21 +9,21 @@ _templates:
           limit: 10
         - exit_status: "*"
           limit: 2
-    # This is enforced by the environment hooks on the release agents
-    # as well, only the master branch may be built there.
-    if: build.branch == "master" || build.tag != null
 
 steps:
   - <<: *common
     label: ":ship: Push all images (x86_64)"
+    if: build.branch == "master" && build.tag == null
     commands:
       - make ARCH=x86_64 push-all-images
   - <<: *common
     label: ":ship: Push all images (aarch64)"
+    if: build.branch == "master" && build.tag == null
     commands:
       - make ARCH=aarch64 push-all-images
   - <<: *common
     label: ":ship: Release"
+    if: build.branch == "master" || build.tag != null
     commands:
       - make BAZEL_OPTIONS=--config=x86_64 artifacts/x86_64
       - make BAZEL_OPTIONS=--config=aarch64 artifacts/aarch64
@@ -31,6 +31,7 @@ steps:
       - cd repo && gsutil cp -r . gs://gvisor/releases/
   - <<: *common
     label: ":ship: Website Deploy"
+    if: build.branch == "master" && build.tag == null
     commands:
       # The built website image must be x86_64.
       - make BAZEL_OPTIONS=--config=x86_64 website-deploy