From 68345b9596af6bc937b7d3e6ae2c47340323005f Mon Sep 17 00:00:00 2001 From: Kevin Minehart Date: Fri, 2 Feb 2024 12:59:48 -0600 Subject: [PATCH] CI: Add dagger cloud token to PR steps for caching (#81817) * Add dagger cloud token to steps for caching * lint --- .drone.yml | 14 +++++++++++++- scripts/drone/steps/rgm.star | 11 +++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a7112bfabae..61469de878f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -572,6 +572,9 @@ steps: --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install + environment: + _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: + from_secret: dagger_token image: grafana/grafana-build:main name: rgm-package pull: always @@ -719,6 +722,9 @@ steps: - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i depends_on: - yarn-install + environment: + _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: + from_secret: dagger_token image: grafana/grafana-build:main name: rgm-build-docker pull: always @@ -1840,6 +1846,9 @@ steps: --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version + environment: + _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: + from_secret: dagger_token image: grafana/grafana-build:main name: rgm-package pull: always @@ -2023,6 +2032,9 @@ steps: - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i depends_on: - update-package-json-version + environment: + _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: + from_secret: dagger_token image: grafana/grafana-build:main name: rgm-build-docker pull: always @@ -4788,6 +4800,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: c04928dc37abd22bc2d48c971f4f1fdfd722d38629016139fd0304e2aef60213 +hmac: f82455098bcac4c4b46f62ec7bc768660ccce0bb4c869da8bb85026e5845aa49 ... diff --git a/scripts/drone/steps/rgm.star b/scripts/drone/steps/rgm.star index a58610269ca..7890bc3955e 100644 --- a/scripts/drone/steps/rgm.star +++ b/scripts/drone/steps/rgm.star @@ -7,6 +7,11 @@ load( "scripts/drone/variables.star", "golang_version", ) +load( + "scripts/drone/vault.star", + "from_secret", + "rgm_dagger_token", +) def artifacts_cmd(artifacts = []): cmd = "/src/grafana-build artifacts " @@ -25,6 +30,9 @@ def rgm_artifacts_step(name = "rgm-package", artifacts = ["targz:grafana:linux/a "image": "grafana/grafana-build:main", "pull": "always", "depends_on": depends_on, + "environment": { + "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token), + }, "commands": [ cmd + "--go-version={} ".format(golang_version) + @@ -46,6 +54,9 @@ def rgm_build_docker_step(ubuntu, alpine, depends_on = ["yarn-install"], file = "name": "rgm-build-docker", "image": "grafana/grafana-build:main", "pull": "always", + "environment": { + "_EXPERIMENTAL_DAGGER_CLOUD_TOKEN": from_secret(rgm_dagger_token), + }, "commands": [ "docker run --privileged --rm tonistiigi/binfmt --install all", "/src/grafana-build artifacts " +