IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: Pin the google/cloud-sdk image (#69037)

Browse Source
This commit is contained in:
Horst Gutmann 2023-05-25 09:17:24 +02:00 committed by GitHub
parent 863f826e62
commit f22d1d14a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
.drone.yml
View File

@ -701,7 +701,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
failure: ignore failure: ignore
image: google/cloud-sdk:406.0.0 image: google/cloud-sdk:431.0.0
name: e2e-tests-artifacts-upload name: e2e-tests-artifacts-upload
when: when:
status: status:
@ -749,7 +749,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -762,7 +762,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -784,7 +784,7 @@ steps:
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-app-private-key from_secret: delivery-bot-app-private-key
failure: ignore failure: ignore
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: publish-images-grafana name: publish-images-grafana
volumes: volumes:
- name: docker - name: docker
@ -1666,7 +1666,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
failure: ignore failure: ignore
image: google/cloud-sdk:406.0.0 image: google/cloud-sdk:431.0.0
name: e2e-tests-artifacts-upload name: e2e-tests-artifacts-upload
when: when:
status: status:
@ -1748,7 +1748,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -1761,7 +1761,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -1784,7 +1784,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-grafana
volumes: volumes:
- name: docker - name: docker
@ -1810,7 +1810,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-grafana-oss
volumes: volumes:
- name: docker - name: docker
@ -2374,7 +2374,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -2387,7 +2387,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -2466,7 +2466,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
failure: ignore failure: ignore
image: google/cloud-sdk:406.0.0 image: google/cloud-sdk:431.0.0
name: e2e-tests-artifacts-upload name: e2e-tests-artifacts-upload
when: when:
status: status:
@ -2919,7 +2919,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -2932,7 +2932,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -3012,7 +3012,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
failure: ignore failure: ignore
image: google/cloud-sdk:406.0.0 image: google/cloud-sdk:431.0.0
name: e2e-tests-artifacts-upload name: e2e-tests-artifacts-upload
when: when:
status: status:
@ -3510,7 +3510,7 @@ steps:
from_secret: docker_enterprise2_repo from_secret: docker_enterprise2_repo
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -3525,7 +3525,7 @@ steps:
from_secret: docker_enterprise2_repo from_secret: docker_enterprise2_repo
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -3544,7 +3544,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-enterprise2 name: fetch-images-enterprise2
volumes: volumes:
- name: docker - name: docker
@ -3568,7 +3568,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-enterprise2
volumes: volumes:
- name: docker - name: docker
@ -3654,7 +3654,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-oss name: fetch-images-oss
volumes: volumes:
- name: docker - name: docker
@ -3677,7 +3677,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-grafana
volumes: volumes:
- name: docker - name: docker
@ -3700,7 +3700,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-grafana-oss
volumes: volumes:
- name: docker - name: docker
@ -3762,7 +3762,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-enterprise name: fetch-images-enterprise
volumes: volumes:
- name: docker - name: docker
@ -3785,7 +3785,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-grafana-enterprise
volumes: volumes:
- name: docker - name: docker
@ -3847,7 +3847,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-enterprise name: fetch-images-enterprise
volumes: volumes:
- name: docker - name: docker
@ -3870,7 +3870,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-grafana-enterprise
volumes: volumes:
- name: docker - name: docker
@ -3922,7 +3922,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-enterprise2 name: fetch-images-enterprise2
volumes: volumes:
- name: docker - name: docker
@ -3985,7 +3985,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-enterprise2 name: fetch-images-enterprise2
volumes: volumes:
- name: docker - name: docker
@ -4475,7 +4475,7 @@ steps:
from_secret: prerelease_bucket from_secret: prerelease_bucket
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: gsutil-stat name: gsutil-stat
trigger: trigger:
event: event:
@ -4621,7 +4621,7 @@ steps:
BUCKET: grafana-prerelease-dev BUCKET: grafana-prerelease-dev
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: gsutil-stat name: gsutil-stat
trigger: trigger:
event: event:
@ -4888,7 +4888,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -4901,7 +4901,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -4980,7 +4980,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
failure: ignore failure: ignore
image: google/cloud-sdk:406.0.0 image: google/cloud-sdk:431.0.0
name: e2e-tests-artifacts-upload name: e2e-tests-artifacts-upload
when: when:
status: status:
@ -5568,7 +5568,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -5581,7 +5581,7 @@ steps:
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -5661,7 +5661,7 @@ steps:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: github_token from_secret: github_token
failure: ignore failure: ignore
image: google/cloud-sdk:406.0.0 image: google/cloud-sdk:431.0.0
name: e2e-tests-artifacts-upload name: e2e-tests-artifacts-upload
when: when:
status: status:
@ -6350,7 +6350,7 @@ steps:
from_secret: docker_enterprise2_repo from_secret: docker_enterprise2_repo
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images name: build-docker-images
volumes: volumes:
- name: docker - name: docker
@ -6365,7 +6365,7 @@ steps:
from_secret: docker_enterprise2_repo from_secret: docker_enterprise2_repo
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: build-docker-images-ubuntu name: build-docker-images-ubuntu
volumes: volumes:
- name: docker - name: docker
@ -6384,7 +6384,7 @@ steps:
from_secret: docker_username from_secret: docker_username
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
image: google/cloud-sdk image: google/cloud-sdk:431.0.0
name: fetch-images-enterprise2 name: fetch-images-enterprise2
volumes: volumes:
- name: docker - name: docker
@ -6408,7 +6408,7 @@ steps:
from_secret: delivery-bot-app-installation-id from_secret: delivery-bot-app-installation-id
GITHUB_APP_PRIVATE_KEY: GITHUB_APP_PRIVATE_KEY:
from_secret: delivery-bot-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 name: publish-images-enterprise2
volumes: volumes:
- name: docker - name: docker
@ -7200,6 +7200,6 @@ kind: secret
name: delivery-bot-app-private-key name: delivery-bot-app-private-key
--- ---
kind: signature kind: signature
hmac: 703aa9d259c63a36ab2f7230cb08f23f24dc5f4667da18ad4f159443dcaaa855 hmac: f6613d5eb9f3d8e308d4c4b55bd980027b1756d3834f0db99f77e6180cc042c6
... ...

3
scripts/drone/events/release.star
View File

@ -13,6 +13,7 @@ load(
"build_plugins_step", "build_plugins_step",
"build_storybook_step", "build_storybook_step",
"clone_enterprise_step", "clone_enterprise_step",
"cloudsdk_image",
"compile_build_cmd", "compile_build_cmd",
"copy_packages_for_docker_step", "copy_packages_for_docker_step",
"download_grabpl_step", "download_grabpl_step",
@ -816,7 +817,7 @@ def verify_release_pipeline(
step = { step = {
"name": "gsutil-stat", "name": "gsutil-stat",
"depends_on": ["clone"], "depends_on": ["clone"],
"image": "google/cloud-sdk", "image": cloudsdk_image,
"environment": { "environment": {
"BUCKET": bucket, "BUCKET": bucket,
"GCP_KEY": gcp_key, "GCP_KEY": gcp_key,

9
scripts/drone/steps/lib.star
View File

@ -9,6 +9,7 @@ load(
) )
grabpl_version = "v3.0.38" grabpl_version = "v3.0.38"
cloudsdk_image = "google/cloud-sdk:431.0.0"
build_image = "grafana/build-container:1.7.4" build_image = "grafana/build-container:1.7.4"
publish_image = "grafana/grafana-ci-deploy:1.3.3" publish_image = "grafana/grafana-ci-deploy:1.3.3"
deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image" 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(): def e2e_tests_artifacts():
return { return {
"name": "e2e-tests-artifacts-upload", "name": "e2e-tests-artifacts-upload",
"image": "google/cloud-sdk:406.0.0", "image": cloudsdk_image,
"depends_on": [ "depends_on": [
"end-to-end-tests-dashboards-suite", "end-to-end-tests-dashboards-suite",
"end-to-end-tests-panels-suite", "end-to-end-tests-panels-suite",
@ -1073,7 +1074,7 @@ def build_docker_images_step(edition, archs = None, ubuntu = False, publish = Fa
return { return {
"name": "build-docker-images" + ubuntu_sfx, "name": "build-docker-images" + ubuntu_sfx,
"image": "google/cloud-sdk", "image": cloudsdk_image,
"depends_on": [ "depends_on": [
"copy-packages-for-docker", "copy-packages-for-docker",
"compile-build-cmd", "compile-build-cmd",
@ -1086,7 +1087,7 @@ def build_docker_images_step(edition, archs = None, ubuntu = False, publish = Fa
def fetch_images_step(edition): def fetch_images_step(edition):
return { return {
"name": "fetch-images-{}".format(edition), "name": "fetch-images-{}".format(edition),
"image": "google/cloud-sdk", "image": cloudsdk_image,
"environment": { "environment": {
"GCP_KEY": from_secret("gcp_key"), "GCP_KEY": from_secret("gcp_key"),
"DOCKER_USER": from_secret("docker_username"), "DOCKER_USER": from_secret("docker_username"),
@ -1165,7 +1166,7 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None):
step = { step = {
"name": "publish-images-{}".format(name), "name": "publish-images-{}".format(name),
"image": "google/cloud-sdk", "image": cloudsdk_image,
"environment": environment, "environment": environment,
"commands": [cmd], "commands": [cmd],
"depends_on": deps, "depends_on": deps,