From eac980f5babad029701e681f6cc6d3b7fd26d456 Mon Sep 17 00:00:00 2001
From: Mike Eltsufin <meltsufin@google.com>
Date: Wed, 6 May 2026 11:25:22 -0400
Subject: [PATCH] chore: tag owlbot images with infrastructure-public-image-
 tag in cloud build

---
 docker/owlbot/nodejs/cloudbuild.yaml           | 3 +++
 docker/owlbot/nodejs_mono_repo/cloudbuild.yaml | 5 +++--
 docker/owlbot/php/cloudbuild.yaml              | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker/owlbot/nodejs/cloudbuild.yaml b/docker/owlbot/nodejs/cloudbuild.yaml
index 2ea79a654..f65c05beb 100644
--- a/docker/owlbot/nodejs/cloudbuild.yaml
+++ b/docker/owlbot/nodejs/cloudbuild.yaml
@@ -20,6 +20,7 @@ steps:
       '-t', 'gcr.io/repo-automation-bots/owlbot-nodejs:$SHORT_SHA',
       '-t', 'gcr.io/repo-automation-bots/owlbot-nodejs:latest',
       '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs:$SHORT_SHA',
+      '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs:infrastructure-public-image-$SHORT_SHA',
       '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest',
       '-f', 'docker/owlbot/nodejs/Dockerfile', '.' ]
 # Push the docker image.
@@ -27,5 +28,7 @@ images:
   - gcr.io/repo-automation-bots/owlbot-nodejs:$SHORT_SHA
   - gcr.io/repo-automation-bots/owlbot-nodejs:latest
   - gcr.io/cloud-devrel-public-resources/owlbot-nodejs:$SHORT_SHA
+  - gcr.io/cloud-devrel-public-resources/owlbot-nodejs:infrastructure-public-image-$SHORT_SHA
   - gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
 
+
diff --git a/docker/owlbot/nodejs_mono_repo/cloudbuild.yaml b/docker/owlbot/nodejs_mono_repo/cloudbuild.yaml
index 504d80bb1..45d534e68 100644
--- a/docker/owlbot/nodejs_mono_repo/cloudbuild.yaml
+++ b/docker/owlbot/nodejs_mono_repo/cloudbuild.yaml
@@ -20,7 +20,7 @@ steps:
       '-t', 'gcr.io/repo-automation-bots/owlbot-nodejs-mono-repo:$SHORT_SHA',
       '-t', 'gcr.io/repo-automation-bots/owlbot-nodejs-mono-repo:latest',
       '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:$SHORT_SHA',
-      '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:infrastructure-public-image-$BUILD_ID',
+      '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:infrastructure-public-image-$SHORT_SHA',
       '-t', 'gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:latest',
       '-f', 'docker/owlbot/nodejs_mono_repo/Dockerfile', '.' ]
 # Push the docker image.
@@ -28,5 +28,6 @@ images:
   - gcr.io/repo-automation-bots/owlbot-nodejs-mono-repo:$SHORT_SHA
   - gcr.io/repo-automation-bots/owlbot-nodejs-mono-repo:latest
   - gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:$SHORT_SHA
-  - gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:infrastructure-public-image-$BUILD_ID
+  - gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:infrastructure-public-image-$SHORT_SHA
   - gcr.io/cloud-devrel-public-resources/owlbot-nodejs-mono-repo:latest
+
diff --git a/docker/owlbot/php/cloudbuild.yaml b/docker/owlbot/php/cloudbuild.yaml
index d780226d1..2ed1a0513 100644
--- a/docker/owlbot/php/cloudbuild.yaml
+++ b/docker/owlbot/php/cloudbuild.yaml
@@ -17,7 +17,10 @@ steps:
     args: [ 'build',
       '-t', 'gcr.io/$PROJECT_ID/owlbot-php:$SHORT_SHA',
       '-t', 'gcr.io/$PROJECT_ID/owlbot-php:latest',
+      '-t', 'gcr.io/$PROJECT_ID/owlbot-php:infrastructure-public-image-$SHORT_SHA',
       '-f', 'docker/owlbot/php/Dockerfile', '.' ]
 images:
   - 'gcr.io/$PROJECT_ID/owlbot-php:$SHORT_SHA'
   - 'gcr.io/$PROJECT_ID/owlbot-php:latest'
+  - 'gcr.io/$PROJECT_ID/owlbot-php:infrastructure-public-image-$SHORT_SHA'
+