Skip to content

Commit 66d2fe7

Browse files
authored
Fixing upload failure (grafana#57290)
1 parent 79afad3 commit 66d2fe7

File tree

2 files changed

+15
-22
lines changed

2 files changed

+15
-22
lines changed

.drone.yml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,6 @@ steps:
494494
- commands:
495495
- apt-get update
496496
- apt-get install -yq zip
497-
- ls -lah ./e2e
498-
- find ./e2e -type f -name "*.mp4"
499497
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
500498
- gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
501499
- find ./e2e -type f -name "*spec.ts.mp4" | zip e2e/videos.zip -@
@@ -517,7 +515,8 @@ steps:
517515
from_secret: gcp_upload_artifacts_key
518516
GITHUB_TOKEN:
519517
from_secret: github_token
520-
image: google/cloud-sdk:367.0.0
518+
failure: ignore
519+
image: google/cloud-sdk:406.0.0
521520
name: e2e-tests-artifacts-upload
522521
when:
523522
status:
@@ -1285,8 +1284,6 @@ steps:
12851284
- commands:
12861285
- apt-get update
12871286
- apt-get install -yq zip
1288-
- ls -lah ./e2e
1289-
- find ./e2e -type f -name "*.mp4"
12901287
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
12911288
- gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
12921289
- find ./e2e -type f -name "*spec.ts.mp4" | zip e2e/videos.zip -@
@@ -1308,7 +1305,8 @@ steps:
13081305
from_secret: gcp_upload_artifacts_key
13091306
GITHUB_TOKEN:
13101307
from_secret: github_token
1311-
image: google/cloud-sdk:367.0.0
1308+
failure: ignore
1309+
image: google/cloud-sdk:406.0.0
13121310
name: e2e-tests-artifacts-upload
13131311
when:
13141312
status:
@@ -2070,8 +2068,6 @@ steps:
20702068
- commands:
20712069
- apt-get update
20722070
- apt-get install -yq zip
2073-
- ls -lah ./e2e
2074-
- find ./e2e -type f -name "*.mp4"
20752071
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
20762072
- gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
20772073
- find ./e2e -type f -name "*spec.ts.mp4" | zip e2e/videos.zip -@
@@ -2093,7 +2089,8 @@ steps:
20932089
from_secret: gcp_upload_artifacts_key
20942090
GITHUB_TOKEN:
20952091
from_secret: github_token
2096-
image: google/cloud-sdk:367.0.0
2092+
failure: ignore
2093+
image: google/cloud-sdk:406.0.0
20972094
name: e2e-tests-artifacts-upload
20982095
when:
20992096
status:
@@ -2711,8 +2708,6 @@ steps:
27112708
- commands:
27122709
- apt-get update
27132710
- apt-get install -yq zip
2714-
- ls -lah ./e2e
2715-
- find ./e2e -type f -name "*.mp4"
27162711
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
27172712
- gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
27182713
- find ./e2e -type f -name "*spec.ts.mp4" | zip e2e/videos.zip -@
@@ -2734,7 +2729,8 @@ steps:
27342729
from_secret: gcp_upload_artifacts_key
27352730
GITHUB_TOKEN:
27362731
from_secret: github_token
2737-
image: google/cloud-sdk:367.0.0
2732+
failure: ignore
2733+
image: google/cloud-sdk:406.0.0
27382734
name: e2e-tests-artifacts-upload
27392735
when:
27402736
status:
@@ -4183,8 +4179,6 @@ steps:
41834179
- commands:
41844180
- apt-get update
41854181
- apt-get install -yq zip
4186-
- ls -lah ./e2e
4187-
- find ./e2e -type f -name "*.mp4"
41884182
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
41894183
- gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
41904184
- find ./e2e -type f -name "*spec.ts.mp4" | zip e2e/videos.zip -@
@@ -4206,7 +4200,8 @@ steps:
42064200
from_secret: gcp_upload_artifacts_key
42074201
GITHUB_TOKEN:
42084202
from_secret: github_token
4209-
image: google/cloud-sdk:367.0.0
4203+
failure: ignore
4204+
image: google/cloud-sdk:406.0.0
42104205
name: e2e-tests-artifacts-upload
42114206
when:
42124207
status:
@@ -4781,8 +4776,6 @@ steps:
47814776
- commands:
47824777
- apt-get update
47834778
- apt-get install -yq zip
4784-
- ls -lah ./e2e
4785-
- find ./e2e -type f -name "*.mp4"
47864779
- printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json
47874780
- gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json
47884781
- find ./e2e -type f -name "*spec.ts.mp4" | zip e2e/videos.zip -@
@@ -4804,7 +4797,8 @@ steps:
48044797
from_secret: gcp_upload_artifacts_key
48054798
GITHUB_TOKEN:
48064799
from_secret: github_token
4807-
image: google/cloud-sdk:367.0.0
4800+
failure: ignore
4801+
image: google/cloud-sdk:406.0.0
48084802
name: e2e-tests-artifacts-upload
48094803
when:
48104804
status:
@@ -5618,6 +5612,6 @@ kind: secret
56185612
name: packages_secret_access_key
56195613
---
56205614
kind: signature
5621-
hmac: 015389b7bbd46fbb8042817bd41a320c71744023710a1bdfb815b9cb28ddd7e3
5615+
hmac: d3b06a42ab277a3f065d4fd6e0367cb67aac08c60d4bb20438d1ba5f64d369cc
56225616

56235617
...

scripts/drone/steps/lib.star

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,14 @@ def store_storybook_step(edition, ver_mode, trigger=None):
306306
def e2e_tests_artifacts(edition):
307307
return {
308308
'name': 'e2e-tests-artifacts-upload' + enterprise2_suffix(edition),
309-
'image': 'google/cloud-sdk:367.0.0',
309+
'image': 'google/cloud-sdk:406.0.0',
310310
'depends_on': [
311311
'end-to-end-tests-dashboards-suite',
312312
'end-to-end-tests-panels-suite',
313313
'end-to-end-tests-smoke-tests-suite',
314314
'end-to-end-tests-various-suite',
315315
],
316+
'failure': 'ignore',
316317
'when': {
317318
'status': [
318319
'success',
@@ -327,8 +328,6 @@ def e2e_tests_artifacts(edition):
327328
'commands': [
328329
'apt-get update',
329330
'apt-get install -yq zip',
330-
'ls -lah ./e2e',
331-
'find ./e2e -type f -name "*.mp4"',
332331
'printenv GCP_GRAFANA_UPLOAD_ARTIFACTS_KEY > /tmp/gcpkey_upload_artifacts.json',
333332
'gcloud auth activate-service-account --key-file=/tmp/gcpkey_upload_artifacts.json',
334333
# we want to only include files in e2e folder that end with .spec.ts.mp4

0 commit comments

Comments
 (0)