mirror of
https://github.com/grafana/grafana.git
synced 2025-01-11 08:32:10 -06:00
Fix release test pipelines dependencies (#56671)
This commit is contained in:
parent
52965de369
commit
668cb25b82
34
.drone.yml
34
.drone.yml
@ -2945,6 +2945,7 @@ steps:
|
||||
- commands:
|
||||
- yarn run ci:test-frontend
|
||||
depends_on:
|
||||
- init-enterprise
|
||||
- yarn-install
|
||||
environment:
|
||||
TEST_MAX_WORKERS: 50%
|
||||
@ -2990,6 +2991,12 @@ steps:
|
||||
from_secret: github_token
|
||||
image: grafana/build-container:1.6.3
|
||||
name: clone-enterprise
|
||||
- commands:
|
||||
- mkdir -p bin
|
||||
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.11/grabpl
|
||||
- chmod +x bin/grabpl
|
||||
image: byrnedo/alpine-curl:0.1.8
|
||||
name: grabpl
|
||||
- commands:
|
||||
- mv bin/grabpl /tmp/
|
||||
- rmdir bin
|
||||
@ -3086,6 +3093,12 @@ steps:
|
||||
from_secret: github_token
|
||||
image: grafana/build-container:1.6.3
|
||||
name: clone-enterprise
|
||||
- commands:
|
||||
- mkdir -p bin
|
||||
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.11/grabpl
|
||||
- chmod +x bin/grabpl
|
||||
image: byrnedo/alpine-curl:0.1.8
|
||||
name: grabpl
|
||||
- commands:
|
||||
- mv bin/grabpl /tmp/
|
||||
- rmdir bin
|
||||
@ -3120,7 +3133,8 @@ steps:
|
||||
- '# The following command will fail if running code generators produces any diff
|
||||
in output.'
|
||||
- CODEGEN_VERIFY=1 make gen-cue
|
||||
depends_on: []
|
||||
depends_on:
|
||||
- init-enterprise
|
||||
image: grafana/build-container:1.6.3
|
||||
name: verify-gen-cue
|
||||
- commands:
|
||||
@ -4962,6 +4976,7 @@ steps:
|
||||
- commands:
|
||||
- yarn run ci:test-frontend
|
||||
depends_on:
|
||||
- init-enterprise
|
||||
- yarn-install
|
||||
environment:
|
||||
TEST_MAX_WORKERS: 50%
|
||||
@ -5001,6 +5016,12 @@ steps:
|
||||
from_secret: github_token
|
||||
image: grafana/build-container:1.6.3
|
||||
name: clone-enterprise
|
||||
- commands:
|
||||
- mkdir -p bin
|
||||
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.11/grabpl
|
||||
- chmod +x bin/grabpl
|
||||
image: byrnedo/alpine-curl:0.1.8
|
||||
name: grabpl
|
||||
- commands:
|
||||
- mv bin/grabpl /tmp/
|
||||
- rmdir bin
|
||||
@ -5088,6 +5109,12 @@ steps:
|
||||
from_secret: github_token
|
||||
image: grafana/build-container:1.6.3
|
||||
name: clone-enterprise
|
||||
- commands:
|
||||
- mkdir -p bin
|
||||
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.11/grabpl
|
||||
- chmod +x bin/grabpl
|
||||
image: byrnedo/alpine-curl:0.1.8
|
||||
name: grabpl
|
||||
- commands:
|
||||
- mv bin/grabpl /tmp/
|
||||
- rmdir bin
|
||||
@ -5119,7 +5146,8 @@ steps:
|
||||
- '# The following command will fail if running code generators produces any diff
|
||||
in output.'
|
||||
- CODEGEN_VERIFY=1 make gen-cue
|
||||
depends_on: []
|
||||
depends_on:
|
||||
- init-enterprise
|
||||
image: grafana/build-container:1.6.3
|
||||
name: verify-gen-cue
|
||||
- commands:
|
||||
@ -5601,6 +5629,6 @@ kind: secret
|
||||
name: packages_secret_access_key
|
||||
---
|
||||
kind: signature
|
||||
hmac: 5c4b0f30f0ddd8e8ad797c10c4aecb29eb04f842450b2ad3feffa91ffb2e8a2b
|
||||
hmac: 694dd8dd441da98425a1d41750ecfa2a6946f2329de2f321be734b031f9cc2e3
|
||||
|
||||
...
|
||||
|
@ -1,6 +1,7 @@
|
||||
load(
|
||||
'scripts/drone/steps/lib.star',
|
||||
'identify_runner_step',
|
||||
'download_grabpl_step',
|
||||
'wire_install_step',
|
||||
'test_backend_step',
|
||||
'test_backend_integration_step',
|
||||
@ -19,7 +20,7 @@ def test_backend(trigger, ver_mode, edition="oss"):
|
||||
environment = {'EDITION': edition}
|
||||
init_steps = []
|
||||
if edition != 'oss':
|
||||
init_steps.extend([clone_enterprise_step(ver_mode), init_enterprise_step(ver_mode),])
|
||||
init_steps.extend([clone_enterprise_step(ver_mode), download_grabpl_step(), init_enterprise_step(ver_mode),])
|
||||
init_steps.extend([
|
||||
identify_runner_step(),
|
||||
compile_build_cmd(edition),
|
||||
|
@ -26,7 +26,7 @@ def test_frontend(trigger, ver_mode, edition="oss"):
|
||||
])
|
||||
test_steps = [
|
||||
betterer_frontend_step(edition),
|
||||
test_frontend_step(),
|
||||
test_frontend_step(edition),
|
||||
]
|
||||
pipeline_name = '{}-test-frontend'.format(ver_mode)
|
||||
if ver_mode in ("release-branch", "release"):
|
||||
|
@ -1184,7 +1184,7 @@ def get_windows_steps(edition, ver_mode):
|
||||
|
||||
def verify_gen_cue_step(edition):
|
||||
deps = []
|
||||
if edition == "enterprise":
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
deps.extend(['init-enterprise'])
|
||||
return {
|
||||
'name': 'verify-gen-cue',
|
||||
|
Loading…
Reference in New Issue
Block a user