From 285d5809c5afb478524f2a8f4d5d3297ce09db11 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 4 Apr 2023 09:36:57 +0300 Subject: [PATCH] [v9.4.x] Backport #65797 and #65806 to v9.4.x (#65857) * CI: Make `init-enterprise` depend on `grabpl` (#65797) Make init-enterprise depend on grabpl # Conflicts: # .drone.yml (cherry picked from commit 821633c796ef06ed9f52734af527e2e59eb8dbd8) # Conflicts: # .drone.yml # scripts/drone/pipelines/test_frontend.star * CI: Exclude cloud related tags from tag events (#65806) * Exclude cloud related tags * Fix starlark lint errors (cherry picked from commit a18ea77aacfc7e4a12b75d4668c68efd83f99f53) # Conflicts: # .drone.yml --- .drone.yml | 83 ++++++++++++++++------ scripts/drone/events/release.star | 17 +++-- scripts/drone/pipelines/test_frontend.star | 2 +- scripts/drone/steps/lib.star | 1 + 4 files changed, 76 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index a2249167038..9a9608a4249 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2259,7 +2259,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -2316,7 +2319,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -2390,7 +2396,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -2453,7 +2462,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -2506,6 +2518,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -2744,7 +2757,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -2767,6 +2783,12 @@ platform: os: linux services: [] steps: +- commands: + - mkdir -p bin + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl + - chmod +x bin/grabpl + image: byrnedo/alpine-curl:0.1.8 + name: grabpl - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -2787,6 +2809,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -2796,12 +2819,6 @@ steps: - echo $DRONE_RUNNER_NAME image: alpine:3.17.1 name: identify-runner -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - yarn install --immutable depends_on: @@ -2829,7 +2846,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -2878,6 +2898,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -2937,7 +2958,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -3020,7 +3044,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -3073,6 +3100,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -3264,7 +3292,10 @@ trigger: exclude: - promote ref: - - refs/tags/v* + exclude: + - refs/tags/*-cloud* + include: + - refs/tags/v* type: docker volumes: - host: @@ -3323,6 +3354,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -4345,6 +4377,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -4998,6 +5031,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -5269,6 +5303,12 @@ platform: os: linux services: [] steps: +- commands: + - mkdir -p bin + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl + - chmod +x bin/grabpl + image: byrnedo/alpine-curl:0.1.8 + name: grabpl - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -5288,6 +5328,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -5297,12 +5338,6 @@ steps: - echo $DRONE_RUNNER_NAME image: alpine:3.17.1 name: identify-runner -- commands: - - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl - - chmod +x bin/grabpl - image: byrnedo/alpine-curl:0.1.8 - name: grabpl - commands: - yarn install --immutable depends_on: @@ -5375,6 +5410,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -5509,6 +5545,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -5729,6 +5766,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -6121,6 +6159,7 @@ steps: - mv /tmp/grabpl bin/ depends_on: - clone-enterprise + - grabpl environment: GITHUB_TOKEN: from_secret: github_token @@ -6507,6 +6546,6 @@ kind: secret name: enterprise2_security_prefix --- kind: signature -hmac: 04f5f2d68a176e1087b598f827902a5565308616b3bf889d3d4a928132b01d5c +hmac: b501639ae35db5abec37f97cdd39d2a31051ec9800424c72ba0869ca3fe60d0b ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 8d0dbcb1bc2..55cf7da36e5 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -65,10 +65,19 @@ load("scripts/drone/vault.star", "from_secret", "prerelease_bucket") ver_mode = "release" release_trigger = { - "event": {"exclude": ["promote"]}, - "ref": [ - "refs/tags/v*", - ], + "event": { + "exclude": [ + "promote", + ], + }, + "ref": { + "include": [ + "refs/tags/v*", + ], + "exclude": [ + "refs/tags/*-cloud*", + ], + }, } def store_npm_packages_step(): diff --git a/scripts/drone/pipelines/test_frontend.star b/scripts/drone/pipelines/test_frontend.star index 55035efee0b..a5bbacedabe 100644 --- a/scripts/drone/pipelines/test_frontend.star +++ b/scripts/drone/pipelines/test_frontend.star @@ -66,10 +66,10 @@ def test_frontend_enterprise(trigger, ver_mode, committish, edition = "enterpris steps = ( [ + download_grabpl_step(), clone_enterprise_step(committish), init_enterprise_step(ver_mode), identify_runner_step(), - download_grabpl_step(), ] + with_deps([yarn_install_step()], ["init-enterprise"]) + [ diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 8ab20540110..e005e096d03 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -128,6 +128,7 @@ def init_enterprise_step(ver_mode): "image": build_image, "depends_on": [ "clone-enterprise", + "grabpl", ], "environment": environment, "commands": [