From 748824836fa29be2a6d943d777c0c3cbdff940f5 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Mon, 22 Nov 2021 13:15:18 +0100 Subject: [PATCH] Remove Linux grabpl download step from Windows enterprise builds (#42065) --- .drone.yml | 20 +------------------- scripts/drone/pipelines/release.star | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index ac1508236c0..457c130db5a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1581,12 +1581,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -2501,12 +2495,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -3403,12 +3391,6 @@ platform: version: "1809" services: [] steps: -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - echo $env:DRONE_RUNNER_NAME image: mcr.microsoft.com/windows:1809 @@ -3538,6 +3520,6 @@ kind: secret name: drone_token --- kind: signature -hmac: 45c40d0ca9041f596e025fd4252fb226d41e7826e1e29e2112663036e1d5bfaf +hmac: c5c3ca4ee288cbf1dc35bb9b0bee010d5ec51caa87a2553f75d488200e65a4f1 ... diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index b3492136b2f..b2aca6bd34e 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -184,7 +184,7 @@ def get_enterprise_pipelines(trigger, ver_mode): ), pipeline( name='enterprise-windows-{}'.format(ver_mode), edition=edition, trigger=trigger, - steps=[download_grabpl_step()] + initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_package_steps, + steps=initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_package_steps, platform='windows', depends_on=['enterprise-build-{}'.format(ver_mode)], ), ]