From 157303d8ba55c6de3b6d4211345540096860cd40 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Wed, 3 Aug 2022 07:51:29 -0400 Subject: [PATCH] Drone: Add retries for pipelines (#53171) * Drone: Add retries for pipelines Self-explanatory, this should reduce flakiness for the clone step * Oops remove extra file --- .drone.yml | 76 +++++++++++++++++++++++++++++++++- scripts/drone/events/cron.star | 3 ++ scripts/drone/utils/utils.star | 6 +++ 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8609e8d4208..fd38c75c32b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,6 @@ --- +clone: + retries: 3 depends_on: [] kind: pipeline name: pr-verify-drone @@ -42,6 +44,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: pr-test-frontend @@ -125,6 +129,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: pr-test-backend @@ -232,6 +238,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: pr-build-e2e @@ -481,6 +489,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: pr-integration-tests @@ -602,6 +612,8 @@ volumes: temp: medium: memory --- +clone: + retries: 3 depends_on: [] kind: pipeline name: pr-docs @@ -699,6 +711,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: main-docs @@ -791,6 +805,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: main-test-frontend @@ -866,6 +882,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: main-test-backend @@ -968,6 +986,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: main-build-e2e-publish @@ -1378,6 +1398,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: main-integration-tests @@ -1488,6 +1510,8 @@ volumes: temp: medium: memory --- +clone: + retries: 3 depends_on: - main-test-frontend - main-test-backend @@ -1548,6 +1572,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: notify-drone-changes @@ -1578,6 +1604,8 @@ trigger: - grafana/grafana type: docker --- +clone: + retries: 3 depends_on: - main-test-frontend - main-test-backend @@ -1646,6 +1674,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: - main-test-frontend - main-test-backend @@ -1677,6 +1707,8 @@ trigger: - failure type: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: release-oss-build-e2e-publish @@ -1982,6 +2014,8 @@ volumes: temp: medium: memory --- +clone: + retries: 3 depends_on: [] kind: pipeline name: release-oss-test @@ -2108,6 +2142,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: release-oss-integration-tests @@ -2216,6 +2252,8 @@ volumes: temp: medium: memory --- +clone: + retries: 3 depends_on: - release-oss-build-e2e-publish - release-oss-test @@ -3045,6 +3083,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-docker-oss-public @@ -3123,6 +3163,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-docker-enterprise-public @@ -3184,6 +3226,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-docker-oss-security @@ -3263,6 +3307,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-docker-enterprise-security @@ -3325,6 +3371,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-artifacts-security @@ -3363,6 +3411,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-artifacts-public @@ -3401,6 +3451,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-npm-packages-public @@ -3454,6 +3506,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: - publish-artifacts-public - publish-docker-oss-public @@ -3508,6 +3562,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: - publish-artifacts-public - publish-docker-oss-public @@ -3562,6 +3618,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: publish-artifacts-page @@ -3594,6 +3652,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: release-branch-oss-build-e2e-publish @@ -3870,6 +3930,8 @@ volumes: temp: medium: memory --- +clone: + retries: 3 depends_on: [] kind: pipeline name: release-branch-oss-test @@ -3990,6 +4052,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 depends_on: [] kind: pipeline name: release-branch-oss-integration-tests @@ -4092,6 +4156,8 @@ volumes: temp: medium: memory --- +clone: + retries: 3 depends_on: - release-branch-oss-build-e2e-publish - release-branch-oss-test @@ -4871,6 +4937,8 @@ volumes: path: /var/run/docker.sock name: docker --- +clone: + retries: 3 kind: pipeline name: scan-grafana/grafana:latest-image platform: @@ -4899,6 +4967,8 @@ trigger: event: cron type: docker --- +clone: + retries: 3 kind: pipeline name: scan-grafana/grafana:main-image platform: @@ -4927,6 +4997,8 @@ trigger: event: cron type: docker --- +clone: + retries: 3 kind: pipeline name: scan-grafana/grafana:latest-ubuntu-image platform: @@ -4956,6 +5028,8 @@ trigger: event: cron type: docker --- +clone: + retries: 3 kind: pipeline name: scan-grafana/grafana:main-ubuntu-image platform: @@ -5016,6 +5090,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: 968320e69b8531451dec23ac2d586296616533986c9e9a767410975109220072 +hmac: 397deadc5d62537ccdb8a02e00a3cb397f3f23c3a175511ad53c31272b878dbd ... diff --git a/scripts/drone/events/cron.star b/scripts/drone/events/cron.star index 4d1ca1b2e2c..c8b3edccb07 100644 --- a/scripts/drone/events/cron.star +++ b/scripts/drone/events/cron.star @@ -23,6 +23,9 @@ def cron_job_pipeline(name, steps): 'event': 'cron', 'cron': 'nightly', }, + 'clone': { + 'retries': 3, + }, 'steps': steps, } diff --git a/scripts/drone/utils/utils.star b/scripts/drone/utils/utils.star index b8d281792d7..e39a728fda4 100644 --- a/scripts/drone/utils/utils.star +++ b/scripts/drone/utils/utils.star @@ -40,6 +40,9 @@ def pipeline( 'trigger': trigger, 'services': services, 'steps': steps, + 'clone': { + 'retries': 3, + }, 'volumes': [{ 'name': 'docker', 'host': { @@ -79,6 +82,9 @@ def notify_pipeline(name, slack_channel, trigger, depends_on=[], template=None, 'steps': [ slack_step(slack_channel, template, secret), ], + 'clone': { + 'retries': 3, + }, 'depends_on': depends_on, }