diff --git a/.drone.yml b/.drone.yml index 1a60792d32a..76bf3c59106 100644 --- a/.drone.yml +++ b/.drone.yml @@ -721,10 +721,8 @@ steps: from_secret: docker_password DOCKER_USER: from_secret: docker_username - GITHUB_APP_ID: - from_secret: delivery-bot-app-id - GITHUB_APP_INSTALLATION_ID: - from_secret: delivery-bot-app-installation-id + GITHUB_APP_ID: "329617" + GITHUB_APP_INSTALLATION_ID: "37346161" GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key failure: ignore @@ -2190,10 +2188,8 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_grafanauploads - GITHUB_APP_ID: - from_secret: delivery-bot-app-id - GITHUB_APP_INSTALLATION_ID: - from_secret: delivery-bot-app-installation-id + GITHUB_APP_ID: "329617" + GITHUB_APP_INSTALLATION_ID: "37346161" GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key image: google/cloud-sdk:431.0.0 @@ -2494,10 +2490,8 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_grafanauploads - GITHUB_APP_ID: - from_secret: delivery-bot-app-id - GITHUB_APP_INSTALLATION_ID: - from_secret: delivery-bot-app-installation-id + GITHUB_APP_ID: "329617" + GITHUB_APP_INSTALLATION_ID: "37346161" GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key image: google/cloud-sdk:431.0.0 @@ -3555,10 +3549,8 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_grafanauploads - GITHUB_APP_ID: - from_secret: delivery-bot-app-id - GITHUB_APP_INSTALLATION_ID: - from_secret: delivery-bot-app-installation-id + GITHUB_APP_ID: "329617" + GITHUB_APP_INSTALLATION_ID: "37346161" GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key image: google/cloud-sdk:431.0.0 @@ -5664,20 +5656,8 @@ kind: secret name: dagger_token --- get: - name: app-id - path: infra/data/ci/grafana-release-eng/grafana-delivery-bot -kind: secret -name: delivery-bot-app-id ---- -get: - name: app-installation-id - path: infra/data/ci/grafana-release-eng/grafana-delivery-bot -kind: secret -name: delivery-bot-app-installation-id ---- -get: - name: app-private-key - path: infra/data/ci/grafana-release-eng/grafana-delivery-bot + name: PRIVATE_KEY + path: ci/data/repo/grafana/grafana/delivery-bot-app kind: secret name: delivery-bot-app-private-key --- @@ -5688,6 +5668,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 10351df8b46f884d83178ff3abb14c25eee0a0bd7498d78e0e79d0d6f81c1f9b +hmac: 24fc7d82aa799bb50dbef765acb62872b890e72a3c1a2a87dc1e0bb5c717ba00 ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 8e37aa6b8a5..c54c58ab223 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -954,8 +954,8 @@ def publish_images_step(ver_mode, docker_repo, trigger = None, depends_on = ["rg "GCP_KEY": from_secret(gcp_grafanauploads), "DOCKER_USER": from_secret("docker_username"), "DOCKER_PASSWORD": from_secret("docker_password"), - "GITHUB_APP_ID": from_secret("delivery-bot-app-id"), - "GITHUB_APP_INSTALLATION_ID": from_secret("delivery-bot-app-installation-id"), + "GITHUB_APP_ID": "329617", + "GITHUB_APP_INSTALLATION_ID": "37346161", "GITHUB_APP_PRIVATE_KEY": from_secret("delivery-bot-app-private-key"), } @@ -972,8 +972,8 @@ def publish_images_step(ver_mode, docker_repo, trigger = None, depends_on = ["rg environment = { "DOCKER_USER": from_secret("docker_username"), "DOCKER_PASSWORD": from_secret("docker_password"), - "GITHUB_APP_ID": from_secret("delivery-bot-app-id"), - "GITHUB_APP_INSTALLATION_ID": from_secret("delivery-bot-app-installation-id"), + "GITHUB_APP_ID": "329617", + "GITHUB_APP_INSTALLATION_ID": "37346161", "GITHUB_APP_PRIVATE_KEY": from_secret("delivery-bot-app-private-key"), } diff --git a/scripts/drone/vault.star b/scripts/drone/vault.star index aa77f81be39..a79f3c7324d 100644 --- a/scripts/drone/vault.star +++ b/scripts/drone/vault.star @@ -153,21 +153,10 @@ def secrets(): "infra/data/ci/grafana-release-eng/rgm", "dagger_token", ), - # grafana-delivery-bot secrets - vault_secret( - "delivery-bot-app-id", - "infra/data/ci/grafana-release-eng/grafana-delivery-bot", - "app-id", - ), - vault_secret( - "delivery-bot-app-installation-id", - "infra/data/ci/grafana-release-eng/grafana-delivery-bot", - "app-installation-id", - ), vault_secret( "delivery-bot-app-private-key", - "infra/data/ci/grafana-release-eng/grafana-delivery-bot", - "app-private-key", + "ci/data/repo/grafana/grafana/delivery-bot-app", + "PRIVATE_KEY", ), vault_secret( "gcr_credentials",