diff --git a/.drone.yml b/.drone.yml index 97ad9bc747b..82f301e9a93 100644 --- a/.drone.yml +++ b/.drone.yml @@ -520,10 +520,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 @@ -1808,10 +1806,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 @@ -2112,10 +2108,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 @@ -3110,10 +3104,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 @@ -5186,20 +5178,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 --- @@ -5210,6 +5190,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 38513409bb4d2834e2140e41a9873c81052683ad8d9c86f3136060c44d099b6f +hmac: 42a35cb0c3a5f320e6bdf3d6727539fb3895832506964ae055907a751c91ab8e ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 949a6fc9242..26463480c81 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -976,8 +976,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"), } @@ -994,8 +994,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 fe1e049a969..05f3617d01f 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",