From 24a14f3cd71badd4f66a4b6c59d944bfd59438af Mon Sep 17 00:00:00 2001 From: Guilherme Caulada Date: Tue, 17 Oct 2023 11:13:14 -0300 Subject: [PATCH] CI: Implement RGM pipeline parity between editions (#76283) * Implement RGM pipeline parity between editions * Use grafana/grafana-build:dev-11c8a20 * Use grafana/grafana-build:dev-261c863 * Use grafana/grafana-build:dev-2db3b18 * Switch nightly trigger for testing purposes * Use grafana-dev api key for testing * Use grafana/grafana-build:dev-d4d2e26 * Use grafana-dev api key * Use production variables * Revert nightly trigger to cron --- .drone.yml | 5 +---- scripts/drone/rgm.star | 33 +++++++++++++++------------------ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.drone.yml b/.drone.yml index fb18ba8f824..8af3f0826ad 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3088,14 +3088,12 @@ services: [] steps: - commands: - echo $env:DRONE_RUNNER_NAME - failure: ignore image: mcr.microsoft.com/windows:1809 name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.42/windows/grabpl.exe -OutFile grabpl.exe - failure: ignore image: grafana/ci-wix:0.1.1 name: windows-init - commands: @@ -3120,7 +3118,6 @@ steps: from_secret: github_token PRERELEASE_BUCKET: from_secret: prerelease_bucket - failure: ignore image: grafana/ci-wix:0.1.1 name: build-windows-installer trigger: @@ -4610,6 +4607,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: d6bd1e6c990959426e575500bd89b4e28cdbc991f245e0723dc912ccc4460470 +hmac: a7032573772937b59787f5c01c113b02afb07a9febf15664a68cbcee1458acc9 ... diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star index 79c346122f3..cd4df9b9de8 100644 --- a/scripts/drone/rgm.star +++ b/scripts/drone/rgm.star @@ -30,7 +30,6 @@ load( ) load( "scripts/drone/utils/utils.star", - "ignore_failure", "pipeline", "with_deps", ) @@ -76,6 +75,17 @@ tag_trigger = { }, } +main_trigger = { + "event": [ + "push", + ], + "branch": "main", + "paths": docs_paths, + "repo": [ + "grafana/grafana", + ], +} + nightly_trigger = { "event": { "include": [ @@ -208,20 +218,9 @@ def rgm_publish_packages(bucket = "grafana-packages"): def rgm_main(): # Runs a package / build process (with some distros) when commits are merged to main - trigger = { - "event": [ - "push", - ], - "branch": "main", - "paths": docs_paths, - "repo": [ - "grafana/grafana", - ], - } - return pipeline( name = "rgm-main-prerelease", - trigger = trigger, + trigger = main_trigger, steps = rgm_run("rgm-build", "drone_publish_main.sh"), depends_on = ["main-test-backend", "main-test-frontend"], ) @@ -239,11 +238,9 @@ def rgm_tag_windows(): return pipeline( name = "rgm-tag-prerelease-windows", trigger = tag_trigger, - steps = ignore_failure( - get_windows_steps( - ver_mode = "release", - bucket = "grafana-prerelease", - ), + steps = get_windows_steps( + ver_mode = "release", + bucket = "grafana-prerelease", ), depends_on = ["rgm-tag-prerelease"], platform = "windows",