diff --git a/.drone.yml b/.drone.yml index f07b9743f13..e5b54634bf0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -701,7 +701,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: @@ -749,7 +749,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 @@ -762,7 +762,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 @@ -784,7 +784,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 @@ -1634,7 +1634,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: @@ -1716,7 +1716,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 @@ -1729,7 +1729,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 @@ -1752,7 +1752,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 @@ -1778,7 +1778,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 @@ -2310,7 +2310,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 @@ -2323,7 +2323,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 @@ -2402,7 +2402,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: @@ -2855,7 +2855,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 @@ -2868,7 +2868,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 @@ -2948,7 +2948,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: @@ -3446,7 +3446,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 @@ -3461,7 +3461,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 @@ -3480,7 +3480,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 @@ -3504,7 +3504,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 @@ -3587,7 +3587,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 @@ -3610,7 +3610,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 @@ -3633,7 +3633,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 @@ -3695,7 +3695,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 @@ -3718,7 +3718,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 @@ -3780,7 +3780,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 @@ -3803,7 +3803,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 @@ -3855,7 +3855,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 @@ -3918,7 +3918,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 @@ -4408,7 +4408,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: @@ -4675,7 +4675,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 @@ -4688,7 +4688,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 @@ -4767,7 +4767,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: @@ -5320,7 +5320,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 @@ -5333,7 +5333,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 @@ -5413,7 +5413,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: @@ -6067,7 +6067,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 @@ -6082,7 +6082,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 @@ -6101,7 +6101,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 @@ -6125,7 +6125,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 @@ -6826,6 +6826,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: 2ca2f9b09d39eff571aca08abd4f635e84a43cfcbbb870a959cebf01ba9927fa +hmac: f7981ec8d7c5b485400bc8c2793d6b11b24006ff6961923a95caf09ca9023b51 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 27efa05e8aa..3559f6bc363 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -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", @@ -813,7 +814,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, diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 125e4472d30..b9ea31a334e 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -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", @@ -1073,7 +1074,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", @@ -1086,7 +1087,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"), @@ -1165,7 +1166,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,