Skip to content

Keep latest metrics image tags updated and set commit image tags after kubectl apply #40577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
damccorm wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Keep latest metrics image tags updated and set commit image tags after kubectl apply #40577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .test-infra/metrics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand All @@ -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.'
Expand Down
9 changes: 6 additions & 3 deletions .test-infra/metrics/build_and_publish_containers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading