[v9.5.x] CI: Pin the google/cloud-sdk image (#69039)
[v9.5.x] CI: Pin the google/cloud-sdk image (#69037)
(cherry picked from commit f22d1d14a0)
Backport of #69037
This commit is contained in:
+40
-40
@@ -697,7 +697,7 @@ steps:
|
||||
GITHUB_TOKEN:
|
||||
from_secret: github_token
|
||||
failure: ignore
|
||||
image: google/cloud-sdk:406.0.0
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: e2e-tests-artifacts-upload
|
||||
when:
|
||||
status:
|
||||
@@ -745,7 +745,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -758,7 +758,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -780,7 +780,7 @@ steps:
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
failure: ignore
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -1598,7 +1598,7 @@ steps:
|
||||
GITHUB_TOKEN:
|
||||
from_secret: github_token
|
||||
failure: ignore
|
||||
image: google/cloud-sdk:406.0.0
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: e2e-tests-artifacts-upload
|
||||
when:
|
||||
status:
|
||||
@@ -1680,7 +1680,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -1693,7 +1693,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -1716,7 +1716,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -1742,7 +1742,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana-oss
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -2243,7 +2243,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -2256,7 +2256,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -2335,7 +2335,7 @@ steps:
|
||||
GITHUB_TOKEN:
|
||||
from_secret: github_token
|
||||
failure: ignore
|
||||
image: google/cloud-sdk:406.0.0
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: e2e-tests-artifacts-upload
|
||||
when:
|
||||
status:
|
||||
@@ -2786,7 +2786,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -2799,7 +2799,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -2879,7 +2879,7 @@ steps:
|
||||
GITHUB_TOKEN:
|
||||
from_secret: github_token
|
||||
failure: ignore
|
||||
image: google/cloud-sdk:406.0.0
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: e2e-tests-artifacts-upload
|
||||
when:
|
||||
status:
|
||||
@@ -3375,7 +3375,7 @@ steps:
|
||||
from_secret: docker_enterprise2_repo
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3390,7 +3390,7 @@ steps:
|
||||
from_secret: docker_enterprise2_repo
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3409,7 +3409,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-enterprise2
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3433,7 +3433,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-enterprise2
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3516,7 +3516,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-oss
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3539,7 +3539,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3562,7 +3562,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana-oss
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3624,7 +3624,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-enterprise
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3647,7 +3647,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana-enterprise
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3709,7 +3709,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-enterprise
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3732,7 +3732,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-grafana-enterprise
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3784,7 +3784,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-enterprise2
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -3847,7 +3847,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-enterprise2
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -4337,7 +4337,7 @@ steps:
|
||||
from_secret: prerelease_bucket
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: gsutil-stat
|
||||
trigger:
|
||||
event:
|
||||
@@ -4602,7 +4602,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -4615,7 +4615,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -4694,7 +4694,7 @@ steps:
|
||||
GITHUB_TOKEN:
|
||||
from_secret: github_token
|
||||
failure: ignore
|
||||
image: google/cloud-sdk:406.0.0
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: e2e-tests-artifacts-upload
|
||||
when:
|
||||
status:
|
||||
@@ -5215,7 +5215,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -5228,7 +5228,7 @@ steps:
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -5308,7 +5308,7 @@ steps:
|
||||
GITHUB_TOKEN:
|
||||
from_secret: github_token
|
||||
failure: ignore
|
||||
image: google/cloud-sdk:406.0.0
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: e2e-tests-artifacts-upload
|
||||
when:
|
||||
status:
|
||||
@@ -5958,7 +5958,7 @@ steps:
|
||||
from_secret: docker_enterprise2_repo
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -5973,7 +5973,7 @@ steps:
|
||||
from_secret: docker_enterprise2_repo
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: build-docker-images-ubuntu
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -5992,7 +5992,7 @@ steps:
|
||||
from_secret: docker_username
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: fetch-images-enterprise2
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -6016,7 +6016,7 @@ steps:
|
||||
from_secret: delivery-bot-app-installation-id
|
||||
GITHUB_APP_PRIVATE_KEY:
|
||||
from_secret: delivery-bot-app-private-key
|
||||
image: google/cloud-sdk
|
||||
image: google/cloud-sdk:431.0.0
|
||||
name: publish-images-enterprise2
|
||||
volumes:
|
||||
- name: docker
|
||||
@@ -6689,6 +6689,6 @@ kind: secret
|
||||
name: delivery-bot-app-private-key
|
||||
---
|
||||
kind: signature
|
||||
hmac: ba3560353c6273337eead9a052fab0b5db8fff11c7ef27e054db265d7b8c6349
|
||||
hmac: 3170a9a39fffee0135f18d79080794c8b4676a2d03f60026e3091831d7ec042b
|
||||
|
||||
...
|
||||
|
||||
@@ -13,6 +13,7 @@ load(
|
||||
"build_plugins_step",
|
||||
"build_storybook_step",
|
||||
"clone_enterprise_step",
|
||||
"cloudsdk_image",
|
||||
"compile_build_cmd",
|
||||
"copy_packages_for_docker_step",
|
||||
"download_grabpl_step",
|
||||
@@ -812,7 +813,7 @@ def verify_release_pipeline(
|
||||
step = {
|
||||
"name": "gsutil-stat",
|
||||
"depends_on": ["clone"],
|
||||
"image": "google/cloud-sdk",
|
||||
"image": cloudsdk_image,
|
||||
"environment": {
|
||||
"BUCKET": bucket,
|
||||
"GCP_KEY": gcp_key,
|
||||
|
||||
@@ -9,6 +9,7 @@ load(
|
||||
)
|
||||
|
||||
grabpl_version = "v3.0.38"
|
||||
cloudsdk_image = "google/cloud-sdk:431.0.0"
|
||||
build_image = "grafana/build-container:1.7.4"
|
||||
publish_image = "grafana/grafana-ci-deploy:1.3.3"
|
||||
deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image"
|
||||
@@ -453,7 +454,7 @@ def store_storybook_step(ver_mode, trigger = None):
|
||||
def e2e_tests_artifacts():
|
||||
return {
|
||||
"name": "e2e-tests-artifacts-upload",
|
||||
"image": "google/cloud-sdk:406.0.0",
|
||||
"image": cloudsdk_image,
|
||||
"depends_on": [
|
||||
"end-to-end-tests-dashboards-suite",
|
||||
"end-to-end-tests-panels-suite",
|
||||
@@ -1071,7 +1072,7 @@ def build_docker_images_step(edition, archs = None, ubuntu = False, publish = Fa
|
||||
|
||||
return {
|
||||
"name": "build-docker-images" + ubuntu_sfx,
|
||||
"image": "google/cloud-sdk",
|
||||
"image": cloudsdk_image,
|
||||
"depends_on": [
|
||||
"copy-packages-for-docker",
|
||||
"compile-build-cmd",
|
||||
@@ -1084,7 +1085,7 @@ def build_docker_images_step(edition, archs = None, ubuntu = False, publish = Fa
|
||||
def fetch_images_step(edition):
|
||||
return {
|
||||
"name": "fetch-images-{}".format(edition),
|
||||
"image": "google/cloud-sdk",
|
||||
"image": cloudsdk_image,
|
||||
"environment": {
|
||||
"GCP_KEY": from_secret("gcp_key"),
|
||||
"DOCKER_USER": from_secret("docker_username"),
|
||||
@@ -1163,7 +1164,7 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None):
|
||||
|
||||
step = {
|
||||
"name": "publish-images-{}".format(name),
|
||||
"image": "google/cloud-sdk",
|
||||
"image": cloudsdk_image,
|
||||
"environment": environment,
|
||||
"commands": [cmd],
|
||||
"depends_on": deps,
|
||||
|
||||
Reference in New Issue
Block a user