From 430b9ae5cb073a2d29e3077f24e9a11de3be0af5 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 26 Apr 2022 13:40:13 +0300 Subject: [PATCH] CI: Rename `main` pipelines (#48245) * Rename main pipelines * Rename dependencies --- .drone.yml | 14 +++++++------- scripts/drone/pipelines/main.star | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 249df7599f2..7554714ed6b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1222,7 +1222,7 @@ depends_on: - main-build-e2e-publish - main-integration-tests kind: pipeline -name: windows-main +name: main-windows platform: arch: amd64 os: windows @@ -1310,9 +1310,9 @@ depends_on: - main-test - main-build-e2e-publish - main-integration-tests -- windows-main +- main-windows kind: pipeline -name: publish-main +name: main-publish node: type: no-parallel platform: @@ -1364,10 +1364,10 @@ depends_on: - main-test - main-build-e2e-publish - main-integration-tests -- windows-main -- publish-main +- main-windows +- main-publish kind: pipeline -name: notify-main +name: main-notify platform: arch: amd64 os: linux @@ -4536,6 +4536,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: 9380beb722ab1276e9219ae41fa07c84db1e7dc249f69e42386f868c026e1795 +hmac: 48f6a3ade75e5993b4a49d8f1a5b7d184a63767a108b16c5f71eca6c986da9c7 ... diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star index e86e337593f..1c1aa5dedca 100644 --- a/scripts/drone/pipelines/main.star +++ b/scripts/drone/pipelines/main.star @@ -238,19 +238,19 @@ def main_pipelines(edition): steps=[download_grabpl_step(), identify_runner_step(),] + integration_test_steps, volumes=volumes, ), pipeline( - name='windows-main', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']), + name='main-windows', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']), steps=[identify_runner_step('windows')] + windows_steps, depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests'], platform='windows', ), notify_pipeline( name='notify-drone-changes', slack_channel='slack-webhooks-test', trigger=drone_change_trigger, template=drone_change_template, secret='drone-changes-webhook', ), pipeline( - name='publish-main', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']), + name='main-publish', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']), steps=[download_grabpl_step(), identify_runner_step(),] + store_steps, - depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests', 'windows-main', ], + depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests', 'main-windows', ], ), notify_pipeline( - name='notify-main', slack_channel='grafana-ci-notifications', trigger=dict(trigger, status=['failure']), - depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests', 'windows-main', 'publish-main'], + name='main-notify', slack_channel='grafana-ci-notifications', trigger=dict(trigger, status=['failure']), + depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests', 'main-windows', 'main-publish'], template=failure_template, secret='slack_webhook' )]