From 86d79e4625aa7f3c93f3c5dedcb9dee02de27510 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 16 Nov 2021 12:46:44 +0200 Subject: [PATCH] Add grabpl step only if platform=linux (#41732) --- .drone.yml | 44 +--------------------------------- scripts/drone/utils/utils.star | 4 ++-- 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/.drone.yml b/.drone.yml index 28684f4687e..704fc7c04db 100644 --- a/.drone.yml +++ b/.drone.yml @@ -623,12 +623,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.5.5/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 @@ -1065,12 +1059,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.5.5/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 @@ -1545,12 +1533,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.5.5/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 @@ -2012,12 +1994,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.5.5/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 @@ -2485,12 +2461,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.5.5/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 @@ -2935,12 +2905,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.5.5/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 @@ -3407,12 +3371,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.5.5/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 @@ -3542,6 +3500,6 @@ kind: secret name: drone_token --- kind: signature -hmac: 73b6a37371bd68484809eb311063fc37319a1cff2eb3aabbdad230ba88e13ff4 +hmac: 434491b80be6d7ca03ed7ca8b9978794ac1bc9ee5037d42bcce9b245c1f76579 ... diff --git a/scripts/drone/utils/utils.star b/scripts/drone/utils/utils.star index 4e9de0ed5ed..0ffb861f060 100644 --- a/scripts/drone/utils/utils.star +++ b/scripts/drone/utils/utils.star @@ -12,6 +12,7 @@ def pipeline( is_downstream=False, install_deps=True, ): if platform != 'windows': + grabpl_step = [download_grabpl()] platform_conf = { 'platform': { 'os': 'linux', @@ -24,6 +25,7 @@ def pipeline( } } else: + grabpl_step = [] platform_conf = { 'platform': { 'os': 'windows', @@ -32,8 +34,6 @@ def pipeline( } } - grabpl_step = [download_grabpl()] - pipeline = { 'kind': 'pipeline', 'type': 'docker',