From c7b219f8d44fc98019b72234b35904957dc37483 Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Wed, 14 Oct 2026 14:24:27 +0000 Subject: [PATCH] Keep latest metrics image tags updated and set commit image tags after kubectl apply --- .test-infra/metrics/build.gradle | 12 ++++++------ .test-infra/metrics/build_and_publish_containers.sh | 9 ++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.test-infra/metrics/build.gradle b/.test-infra/metrics/build.gradle index 01d8eefa91cc..725fa86b5e99 100644 --- a/.test-infra/metrics/build.gradle +++ b/.test-infra/metrics/build.gradle @@ -110,7 +110,7 @@ task deploy { // All images have the same tag, it doesn't matter which we choose. String image = (stdout.toString().split(' ') as List)[0] - String currentImageTag = (image.split(':') as List)[1] + String currentImageTag = image.contains(':') ? (image.split(':') as List)[1] : 'latest' println "Current image tag: ${currentImageTag}" println "Last commit ID: ${lastCommitId}" @@ -124,15 +124,15 @@ task deploy { exec { executable 'sh' - args '-c', "kubectl --namespace default set image deployment/beamgrafana \ - beamgrafana=gcr.io/apache-beam-testing/beamgrafana:${project.lastCommitId} \ - beammetricssyncjenkins=gcr.io/apache-beam-testing/beammetricssyncjenkins:${project.lastCommitId} \ - beammetricssyncgithub=gcr.io/apache-beam-testing/beammetricssyncgithub:${project.lastCommitId}" + args '-c', 'kubectl --namespace default apply -f kubernetes/beamgrafana-deploy.yaml' } exec { executable 'sh' - args '-c', 'kubectl --namespace default apply -f kubernetes/beamgrafana-deploy.yaml' + args '-c', "kubectl --namespace default set image deployment/beamgrafana \ + beamgrafana=gcr.io/apache-beam-testing/beamgrafana:${project.lastCommitId} \ + beammetricssyncjenkins=gcr.io/apache-beam-testing/beammetricssyncjenkins:${project.lastCommitId} \ + beammetricssyncgithub=gcr.io/apache-beam-testing/beammetricssyncgithub:${project.lastCommitId}" } } else { println 'Nothing to do, exiting.' diff --git a/.test-infra/metrics/build_and_publish_containers.sh b/.test-infra/metrics/build_and_publish_containers.sh index dbc3dbbfe66d..db5264634320 100755 --- a/.test-infra/metrics/build_and_publish_containers.sh +++ b/.test-infra/metrics/build_and_publish_containers.sh @@ -38,14 +38,17 @@ CONTAINER_VERSION_NAME=${2:-latest} echo echo ===========Building containers========== -docker build -t gcr.io/${PROJECT_ID}/beamgrafana:$CONTAINER_VERSION_NAME ./grafana -docker build -t gcr.io/${PROJECT_ID}/beammetricssyncjenkins:$CONTAINER_VERSION_NAME ./sync/jenkins -docker build -t gcr.io/${PROJECT_ID}/beammetricssyncgithub:$CONTAINER_VERSION_NAME ./sync/github +docker build -t gcr.io/${PROJECT_ID}/beamgrafana:$CONTAINER_VERSION_NAME -t gcr.io/${PROJECT_ID}/beamgrafana:latest ./grafana +docker build -t gcr.io/${PROJECT_ID}/beammetricssyncjenkins:$CONTAINER_VERSION_NAME -t gcr.io/${PROJECT_ID}/beammetricssyncjenkins:latest ./sync/jenkins +docker build -t gcr.io/${PROJECT_ID}/beammetricssyncgithub:$CONTAINER_VERSION_NAME -t gcr.io/${PROJECT_ID}/beammetricssyncgithub:latest ./sync/github if [ "$DO_PUSH" = true ]; then echo echo ===========Publishing containers========== docker push gcr.io/${PROJECT_ID}/beamgrafana:$CONTAINER_VERSION_NAME + docker push gcr.io/${PROJECT_ID}/beamgrafana:latest docker push gcr.io/${PROJECT_ID}/beammetricssyncjenkins:$CONTAINER_VERSION_NAME + docker push gcr.io/${PROJECT_ID}/beammetricssyncjenkins:latest docker push gcr.io/${PROJECT_ID}/beammetricssyncgithub:$CONTAINER_VERSION_NAME + docker push gcr.io/${PROJECT_ID}/beammetricssyncgithub:latest fi