IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove references from pr and main starlark (#48544)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2022-04-29 18:15:40 +03:00 committed by GitHub
parent 18f7da97ac
commit b414ac5d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/drone/pipelines/main.star
View File

@ -72,7 +72,6 @@ ver_mode = 'main'
def get_steps(edition): def get_steps(edition):
services = integration_test_services(edition) services = integration_test_services(edition)
include_enterprise2 = edition == 'enterprise'
init_steps = [ init_steps = [
identify_runner_step(), identify_runner_step(),
download_grabpl_step(), download_grabpl_step(),
@ -105,22 +104,9 @@ def get_steps(edition):
mysql_integration_tests_step(edition=edition, ver_mode=ver_mode), mysql_integration_tests_step(edition=edition, ver_mode=ver_mode),
] ]
if include_enterprise2:
edition2 = 'enterprise2'
build_steps.append(benchmark_ldap_step())
services.append(ldap_service())
test_steps.extend([
lint_backend_step(edition=edition2),
test_backend_step(edition=edition2),
test_backend_integration_step(edition=edition2),
])
build_steps.extend([
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-amd64']),
])
# Insert remaining steps # Insert remaining steps
build_steps.extend([ build_steps.extend([
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2), package_step(edition=edition, ver_mode=ver_mode),
grafana_server_step(edition=edition), grafana_server_step(edition=edition),
e2e_tests_step('dashboards-suite', edition=edition), e2e_tests_step('dashboards-suite', edition=edition),
e2e_tests_step('smoke-tests-suite', edition=edition), e2e_tests_step('smoke-tests-suite', edition=edition),
@ -138,30 +124,14 @@ def get_steps(edition):
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana-oss', trigger=trigger_oss) publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana-oss', trigger=trigger_oss)
]) ])
if include_enterprise2:
integration_test_steps.extend([redis_integration_tests_step(edition=edition2, ver_mode=ver_mode), memcached_integration_tests_step(edition=edition2, ver_mode=ver_mode)])
build_steps.extend([ build_steps.extend([
release_canary_npm_packages_step(edition, trigger=trigger_oss), release_canary_npm_packages_step(edition, trigger=trigger_oss),
upload_packages_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss), upload_packages_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss),
upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss) upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss)
]) ])
if include_enterprise2:
edition2 = 'enterprise2'
build_steps.extend([
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-amd64']),
upload_packages_step(edition=edition2, ver_mode=ver_mode),
upload_cdn_step(edition=edition2, ver_mode=ver_mode)
])
windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode) windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode)
if edition == 'enterprise': store_steps = [store_packages_step(edition=edition, ver_mode=ver_mode),]
store_steps = []
else:
store_steps = [
store_packages_step(edition=edition, ver_mode=ver_mode),
]
return init_steps, test_steps, build_steps, integration_test_steps, windows_steps, store_steps return init_steps, test_steps, build_steps, integration_test_steps, windows_steps, store_steps
@ -221,10 +191,6 @@ def main_pipelines(edition):
} }
init_steps, test_steps, build_steps, integration_test_steps, windows_steps, store_steps = get_steps(edition=edition) init_steps, test_steps, build_steps, integration_test_steps, windows_steps, store_steps = get_steps(edition=edition)
if edition == 'enterprise':
services.append(ldap_service())
integration_test_steps.append(benchmark_ldap_step())
pipelines = [docs_pipelines(edition, ver_mode, trigger), pipeline( pipelines = [docs_pipelines(edition, ver_mode, trigger), pipeline(
name='main-test', edition=edition, trigger=trigger, services=[], name='main-test', edition=edition, trigger=trigger, services=[],
steps=init_steps + test_steps, steps=init_steps + test_steps,

39
scripts/drone/pipelines/pr.star
View File

@ -86,8 +86,7 @@ def pr_test_frontend():
) )
def pr_test_backend(edition): def pr_test_backend():
include_enterprise2 = edition == 'enterprise'
init_steps = [ init_steps = [
identify_runner_step(), identify_runner_step(),
download_grabpl_step(), download_grabpl_step(),
@ -98,17 +97,10 @@ def pr_test_backend(edition):
lint_drone_step(), lint_drone_step(),
codespell_step(), codespell_step(),
shellcheck_step(), shellcheck_step(),
lint_backend_step(edition=edition), lint_backend_step(edition="oss"),
test_backend_step(edition=edition), test_backend_step(edition="oss"),
test_backend_integration_step(edition=edition), test_backend_integration_step(edition="oss"),
] ]
if include_enterprise2:
edition2 = 'enterprise2'
test_steps.extend([
lint_backend_step(edition=edition2),
test_backend_step(edition=edition2),
test_backend_integration_step(edition=edition2),
])
return pipeline( return pipeline(
name='pr-test-backend', edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps, name='pr-test-backend', edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps,
) )
@ -118,7 +110,6 @@ def pr_pipelines(edition):
services = integration_test_services(edition) services = integration_test_services(edition)
volumes = integration_test_services_volumes() volumes = integration_test_services_volumes()
variants = ['linux-amd64', 'linux-amd64-musl', 'darwin-amd64', 'windows-amd64', 'armv6', ] variants = ['linux-amd64', 'linux-amd64-musl', 'darwin-amd64', 'windows-amd64', 'armv6', ]
include_enterprise2 = edition == 'enterprise'
init_steps = [ init_steps = [
identify_runner_step(), identify_runner_step(),
download_grabpl_step(), download_grabpl_step(),
@ -139,17 +130,9 @@ def pr_pipelines(edition):
mysql_integration_tests_step(edition=edition, ver_mode=ver_mode), mysql_integration_tests_step(edition=edition, ver_mode=ver_mode),
] ]
if include_enterprise2:
edition2 = 'enterprise2'
build_steps.append(benchmark_ldap_step())
services.append(ldap_service())
build_steps.extend([
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-amd64']),
])
# Insert remaining build_steps # Insert remaining build_steps
build_steps.extend([ build_steps.extend([
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=variants), package_step(edition=edition, ver_mode=ver_mode, variants=variants),
grafana_server_step(edition=edition), grafana_server_step(edition=edition),
e2e_tests_step('dashboards-suite', edition=edition), e2e_tests_step('dashboards-suite', edition=edition),
e2e_tests_step('smoke-tests-suite', edition=edition), e2e_tests_step('smoke-tests-suite', edition=edition),
@ -162,19 +145,9 @@ def pr_pipelines(edition):
build_docker_images_step(edition=edition, ver_mode=ver_mode, archs=['amd64', ]), build_docker_images_step(edition=edition, ver_mode=ver_mode, archs=['amd64', ]),
]) ])
if include_enterprise2:
integration_test_steps.extend([
redis_integration_tests_step(edition=edition2, ver_mode=ver_mode),
memcached_integration_tests_step(edition=edition, ver_mode=ver_mode),
])
build_steps.extend([
package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2,
variants=['linux-amd64']),
])
return [ return [
pr_test_frontend(), pr_test_frontend(),
pr_test_backend(edition), pr_test_backend(),
pipeline( pipeline(
name='pr-build-e2e', edition=edition, trigger=trigger, services=[], steps=init_steps + build_steps, name='pr-build-e2e', edition=edition, trigger=trigger, services=[], steps=init_steps + build_steps,
), pipeline( ), pipeline(