From e3bb53b64d37221a157519e3392b6cf0fe715aed Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 23 Nov 2021 09:57:16 +0100 Subject: [PATCH] CI: Remove Linux `grabpl` step dependency from Windows builds (#42069) * Remove Linux grabpl download step from Windows oss builds * Remove Linux grabpl download step from Windows enterprise builds --- .drone.yml | 38 +--------------------------- scripts/drone/pipelines/release.star | 4 +-- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/.drone.yml b/.drone.yml index 45c25fb9a03..635e4ed43fe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1115,12 +1115,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.7.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 @@ -1587,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.7.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 @@ -2048,12 +2036,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.7.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 @@ -2513,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.7.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 @@ -2957,12 +2933,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.7.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 @@ -3421,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.7.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 @@ -3556,6 +3520,6 @@ kind: secret name: drone_token --- kind: signature -hmac: c456d83e6b32d4fcfb9f00c1e9827fbbc3413583e54883c14e38e4dba3e748f1 +hmac: 506f659ace94bf2db684864909ea29b8963f3655d4f02b5dbd0d3440271be38f ... diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index ed37a28731b..b2aca6bd34e 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -167,7 +167,7 @@ def get_oss_pipelines(trigger, ver_mode): ), pipeline( name='oss-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=['oss-build-{}'.format(ver_mode)], ), ] @@ -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)], ), ]