Build: Drone starlark file cleanup (#59919)
* format drone starlark files with black * clean up unused params * more simplification * more cleanup * more cleanup
This commit is contained in:
@@ -1,42 +1,41 @@
|
||||
load(
|
||||
'scripts/drone/steps/lib.star',
|
||||
'download_grabpl_step',
|
||||
'build_image',
|
||||
'identify_runner_step',
|
||||
'wire_install_step',
|
||||
'yarn_install_step',
|
||||
'build_backend_step',
|
||||
'build_frontend_step',
|
||||
'build_frontend_package_step',
|
||||
'build_plugins_step',
|
||||
'package_step',
|
||||
'grafana_server_step',
|
||||
'e2e_tests_step',
|
||||
'e2e_tests_artifacts',
|
||||
'build_storybook_step',
|
||||
'copy_packages_for_docker_step',
|
||||
'build_docker_images_step',
|
||||
'publish_images_step',
|
||||
'postgres_integration_tests_step',
|
||||
'mysql_integration_tests_step',
|
||||
'redis_integration_tests_step',
|
||||
'memcached_integration_tests_step',
|
||||
'get_windows_steps',
|
||||
'benchmark_ldap_step',
|
||||
'betterer_frontend_step',
|
||||
'build_backend_step',
|
||||
'build_docker_images_step',
|
||||
'build_frontend_package_step',
|
||||
'build_frontend_step',
|
||||
'build_image',
|
||||
'build_plugins_step',
|
||||
'build_storybook_step',
|
||||
'cloud_plugins_e2e_tests_step',
|
||||
'compile_build_cmd',
|
||||
'copy_packages_for_docker_step',
|
||||
'download_grabpl_step',
|
||||
'e2e_tests_artifacts',
|
||||
'e2e_tests_step',
|
||||
'enterprise_downstream_step',
|
||||
'frontend_metrics_step',
|
||||
'store_storybook_step',
|
||||
'grafana_server_step',
|
||||
'identify_runner_step',
|
||||
'memcached_integration_tests_step',
|
||||
'mysql_integration_tests_step',
|
||||
'package_step',
|
||||
'postgres_integration_tests_step',
|
||||
'publish_images_step',
|
||||
'redis_integration_tests_step',
|
||||
'release_canary_npm_packages_step',
|
||||
'upload_packages_step',
|
||||
'upload_cdn_step',
|
||||
'verify_gen_cue_step',
|
||||
'verify_gen_jsonnet_step',
|
||||
'store_storybook_step',
|
||||
'test_a11y_frontend_step',
|
||||
'trigger_oss',
|
||||
'betterer_frontend_step',
|
||||
'trigger_test_release',
|
||||
'compile_build_cmd',
|
||||
'cloud_plugins_e2e_tests_step',
|
||||
'upload_cdn_step',
|
||||
'upload_packages_step',
|
||||
'verify_gen_cue_step',
|
||||
'verify_gen_jsonnet_step',
|
||||
'wire_install_step',
|
||||
'yarn_install_step',
|
||||
)
|
||||
|
||||
load(
|
||||
@@ -44,68 +43,118 @@ load(
|
||||
'pipeline',
|
||||
)
|
||||
|
||||
def build_e2e(trigger, ver_mode, edition):
|
||||
|
||||
def build_e2e(trigger, ver_mode):
|
||||
edition = 'oss'
|
||||
environment = {'EDITION': edition}
|
||||
variants = ['linux-amd64', 'linux-amd64-musl', 'darwin-amd64', 'windows-amd64',]
|
||||
init_steps = [
|
||||
identify_runner_step(),
|
||||
download_grabpl_step(),
|
||||
compile_build_cmd(),
|
||||
verify_gen_cue_step(edition="oss"),
|
||||
verify_gen_jsonnet_step(edition="oss"),
|
||||
verify_gen_cue_step(),
|
||||
verify_gen_jsonnet_step(),
|
||||
wire_install_step(),
|
||||
yarn_install_step(),
|
||||
]
|
||||
|
||||
build_steps = []
|
||||
variants = None
|
||||
|
||||
if ver_mode == 'pr':
|
||||
build_steps.extend([trigger_test_release()])
|
||||
build_steps.extend([enterprise_downstream_step(edition=edition, ver_mode=ver_mode)])
|
||||
build_steps.extend([
|
||||
build_backend_step(edition=edition, ver_mode=ver_mode),
|
||||
build_frontend_step(edition=edition, ver_mode=ver_mode),
|
||||
build_frontend_package_step(edition=edition, ver_mode=ver_mode),
|
||||
build_plugins_step(edition=edition, ver_mode=ver_mode),
|
||||
])
|
||||
if ver_mode == 'main':
|
||||
build_steps.extend([package_step(edition=edition, ver_mode=ver_mode)])
|
||||
elif ver_mode == 'pr':
|
||||
build_steps.extend([package_step(edition=edition, ver_mode=ver_mode, variants=variants)])
|
||||
build_steps.extend(
|
||||
[
|
||||
trigger_test_release(),
|
||||
enterprise_downstream_step(ver_mode=ver_mode),
|
||||
]
|
||||
)
|
||||
|
||||
build_steps.extend([
|
||||
grafana_server_step(edition=edition),
|
||||
e2e_tests_step('dashboards-suite', edition=edition),
|
||||
e2e_tests_step('smoke-tests-suite', edition=edition),
|
||||
e2e_tests_step('panels-suite', edition=edition),
|
||||
e2e_tests_step('various-suite', edition=edition),
|
||||
cloud_plugins_e2e_tests_step('cloud-plugins-suite', edition=edition, cloud='azure', trigger=trigger_oss),
|
||||
e2e_tests_artifacts(edition=edition),
|
||||
build_storybook_step(edition=edition, ver_mode=ver_mode),
|
||||
copy_packages_for_docker_step(),
|
||||
test_a11y_frontend_step(ver_mode=ver_mode, edition=edition),
|
||||
])
|
||||
if ver_mode == 'main':
|
||||
build_steps.extend([
|
||||
store_storybook_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss),
|
||||
frontend_metrics_step(edition=edition, trigger=trigger_oss)
|
||||
])
|
||||
variants = [
|
||||
'linux-amd64',
|
||||
'linux-amd64-musl',
|
||||
'darwin-amd64',
|
||||
'windows-amd64',
|
||||
]
|
||||
|
||||
build_steps.extend(
|
||||
[
|
||||
build_backend_step(edition=edition, ver_mode=ver_mode),
|
||||
build_frontend_step(edition=edition, ver_mode=ver_mode),
|
||||
build_frontend_package_step(edition=edition, ver_mode=ver_mode),
|
||||
build_plugins_step(edition=edition, ver_mode=ver_mode),
|
||||
package_step(edition=edition, ver_mode=ver_mode, variants=variants),
|
||||
grafana_server_step(edition=edition),
|
||||
e2e_tests_step('dashboards-suite'),
|
||||
e2e_tests_step('smoke-tests-suite'),
|
||||
e2e_tests_step('panels-suite'),
|
||||
e2e_tests_step('various-suite'),
|
||||
cloud_plugins_e2e_tests_step(
|
||||
'cloud-plugins-suite',
|
||||
cloud='azure',
|
||||
trigger=trigger_oss,
|
||||
),
|
||||
e2e_tests_artifacts(),
|
||||
build_storybook_step(ver_mode=ver_mode),
|
||||
copy_packages_for_docker_step(),
|
||||
test_a11y_frontend_step(ver_mode=ver_mode),
|
||||
]
|
||||
)
|
||||
|
||||
if ver_mode == 'main':
|
||||
build_steps.extend([
|
||||
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=False),
|
||||
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=False),
|
||||
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana', trigger=trigger_oss),
|
||||
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana-oss', 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_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss)
|
||||
])
|
||||
build_steps.extend(
|
||||
[
|
||||
store_storybook_step(ver_mode=ver_mode, trigger=trigger_oss),
|
||||
frontend_metrics_step(trigger=trigger_oss),
|
||||
build_docker_images_step(
|
||||
edition=edition, ver_mode=ver_mode, publish=False
|
||||
),
|
||||
build_docker_images_step(
|
||||
edition=edition, ver_mode=ver_mode, publish=False, ubuntu=True
|
||||
),
|
||||
publish_images_step(
|
||||
edition=edition,
|
||||
ver_mode=ver_mode,
|
||||
mode='',
|
||||
docker_repo='grafana',
|
||||
trigger=trigger_oss,
|
||||
),
|
||||
publish_images_step(
|
||||
edition=edition,
|
||||
ver_mode=ver_mode,
|
||||
mode='',
|
||||
docker_repo='grafana-oss',
|
||||
trigger=trigger_oss,
|
||||
),
|
||||
release_canary_npm_packages_step(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
|
||||
),
|
||||
]
|
||||
)
|
||||
elif ver_mode == 'pr':
|
||||
build_steps.extend([build_docker_images_step(edition=edition, ver_mode=ver_mode, archs=['amd64', ])])
|
||||
build_steps.extend(
|
||||
[
|
||||
build_docker_images_step(
|
||||
edition=edition,
|
||||
ver_mode=ver_mode,
|
||||
archs=[
|
||||
'amd64',
|
||||
],
|
||||
)
|
||||
]
|
||||
)
|
||||
|
||||
publish_suffix = ''
|
||||
if ver_mode == 'main':
|
||||
publish_suffix = '-publish'
|
||||
|
||||
return pipeline(
|
||||
name='{}-build-e2e{}'.format(ver_mode, publish_suffix), edition="oss", trigger=trigger, services=[], steps=init_steps + build_steps, environment=environment,
|
||||
name='{}-build-e2e{}'.format(ver_mode, publish_suffix),
|
||||
edition="oss",
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=init_steps + build_steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -31,8 +31,9 @@ docs_paths = {
|
||||
],
|
||||
}
|
||||
|
||||
def docs_pipelines(edition, ver_mode, trigger):
|
||||
environment = {'EDITION': edition}
|
||||
|
||||
def docs_pipelines(ver_mode, trigger):
|
||||
environment = {'EDITION': 'oss'}
|
||||
steps = [
|
||||
download_grabpl_step(),
|
||||
identify_runner_step(),
|
||||
@@ -43,9 +44,15 @@ def docs_pipelines(edition, ver_mode, trigger):
|
||||
]
|
||||
|
||||
return pipeline(
|
||||
name='{}-docs'.format(ver_mode), edition=edition, trigger=trigger, services=[], steps=steps, environment=environment,
|
||||
name='{}-docs'.format(ver_mode),
|
||||
edition='oss',
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
|
||||
def lint_docs():
|
||||
return {
|
||||
'name': 'lint-docs',
|
||||
@@ -71,6 +78,7 @@ def trigger_docs_main():
|
||||
'paths': docs_paths,
|
||||
}
|
||||
|
||||
|
||||
def trigger_docs_pr():
|
||||
return {
|
||||
'event': [
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
load(
|
||||
'scripts/drone/steps/lib.star',
|
||||
'identify_runner_step',
|
||||
'compile_build_cmd',
|
||||
'download_grabpl_step',
|
||||
'identify_runner_step',
|
||||
'verify_gen_cue_step',
|
||||
'verify_gen_jsonnet_step',
|
||||
'wire_install_step',
|
||||
'postgres_integration_tests_step',
|
||||
'mysql_integration_tests_step',
|
||||
'compile_build_cmd',
|
||||
)
|
||||
|
||||
load(
|
||||
@@ -22,24 +22,33 @@ load(
|
||||
'pipeline',
|
||||
)
|
||||
|
||||
def integration_tests(trigger, ver_mode, edition):
|
||||
environment = {'EDITION': edition}
|
||||
services = integration_test_services(edition)
|
||||
|
||||
def integration_tests(trigger, prefix):
|
||||
environment = {'EDITION': 'oss'}
|
||||
|
||||
services = integration_test_services(edition="oss")
|
||||
volumes = integration_test_services_volumes()
|
||||
|
||||
init_steps = [
|
||||
download_grabpl_step(),
|
||||
compile_build_cmd(),
|
||||
identify_runner_step(),
|
||||
verify_gen_cue_step(edition="oss"),
|
||||
verify_gen_jsonnet_step(edition="oss"),
|
||||
verify_gen_cue_step(),
|
||||
verify_gen_jsonnet_step(),
|
||||
wire_install_step(),
|
||||
]
|
||||
|
||||
test_steps = [
|
||||
postgres_integration_tests_step(edition=edition, ver_mode=ver_mode),
|
||||
mysql_integration_tests_step(edition=edition, ver_mode=ver_mode),
|
||||
postgres_integration_tests_step(),
|
||||
mysql_integration_tests_step(),
|
||||
]
|
||||
|
||||
return pipeline(
|
||||
name='{}-integration-tests'.format(ver_mode), edition="oss", trigger=trigger, services=services, steps=init_steps + test_steps,
|
||||
environment=environment, volumes=volumes
|
||||
name='{}-integration-tests'.format(prefix),
|
||||
edition='oss',
|
||||
trigger=trigger,
|
||||
environment=environment,
|
||||
services=services,
|
||||
volumes=volumes,
|
||||
steps=init_steps + test_steps,
|
||||
)
|
||||
|
||||
@@ -12,21 +12,31 @@ load(
|
||||
'pipeline',
|
||||
)
|
||||
|
||||
|
||||
def lint_backend_pipeline(trigger, ver_mode):
|
||||
environment = {'EDITION': 'oss'}
|
||||
|
||||
wire_step = wire_install_step()
|
||||
wire_step.update({ 'depends_on': [] })
|
||||
wire_step.update({'depends_on': []})
|
||||
|
||||
init_steps = [
|
||||
identify_runner_step(),
|
||||
compile_build_cmd(),
|
||||
wire_step,
|
||||
]
|
||||
|
||||
test_steps = [
|
||||
lint_backend_step(edition="oss"),
|
||||
lint_backend_step(),
|
||||
]
|
||||
|
||||
if ver_mode == 'main':
|
||||
test_steps.extend([lint_drone_step()])
|
||||
test_steps.append(lint_drone_step())
|
||||
|
||||
return pipeline(
|
||||
name='{}-lint-backend'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment,
|
||||
name='{}-lint-backend'.format(ver_mode),
|
||||
edition="oss",
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=init_steps + test_steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -10,17 +10,24 @@ load(
|
||||
'pipeline',
|
||||
)
|
||||
|
||||
|
||||
def lint_frontend_pipeline(trigger, ver_mode):
|
||||
environment = {'EDITION': 'oss'}
|
||||
yarn_step = yarn_install_step()
|
||||
yarn_step.update({ 'depends_on': [] })
|
||||
|
||||
init_steps = [
|
||||
identify_runner_step(),
|
||||
yarn_step,
|
||||
yarn_install_step(),
|
||||
]
|
||||
|
||||
test_steps = [
|
||||
lint_frontend_step(),
|
||||
]
|
||||
|
||||
return pipeline(
|
||||
name='{}-lint-frontend'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment,
|
||||
name='{}-lint-frontend'.format(ver_mode),
|
||||
edition="oss",
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=init_steps + test_steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -14,9 +14,6 @@ load(
|
||||
|
||||
|
||||
def publish_image_steps(edition, mode, docker_repo):
|
||||
additional_docker_repo = ""
|
||||
if edition == 'oss':
|
||||
additional_docker_repo='grafana/grafana-oss'
|
||||
steps = [
|
||||
identify_runner_step(),
|
||||
download_grabpl_step(),
|
||||
@@ -24,29 +21,55 @@ def publish_image_steps(edition, mode, docker_repo):
|
||||
fetch_images_step(edition),
|
||||
publish_images_step(edition, 'release', mode, docker_repo),
|
||||
]
|
||||
if additional_docker_repo != "":
|
||||
steps.extend([publish_images_step(edition, 'release', mode, additional_docker_repo)])
|
||||
|
||||
if edition == 'oss':
|
||||
steps.append(
|
||||
publish_images_step(edition, 'release', mode, 'grafana/grafana-oss')
|
||||
)
|
||||
|
||||
return steps
|
||||
|
||||
|
||||
def publish_image_pipelines_public():
|
||||
mode='public'
|
||||
mode = 'public'
|
||||
trigger = {
|
||||
'event': ['promote'],
|
||||
'target': [mode],
|
||||
}
|
||||
return [pipeline(
|
||||
name='publish-docker-oss-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='oss', mode=mode, docker_repo='grafana'), edition="", environment = {'EDITION': 'oss'}
|
||||
), pipeline(
|
||||
name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise', mode=mode, docker_repo='grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
|
||||
),]
|
||||
return [
|
||||
pipeline(
|
||||
name='publish-docker-oss-{}'.format(mode),
|
||||
trigger=trigger,
|
||||
steps=publish_image_steps(edition='oss', mode=mode, docker_repo='grafana'),
|
||||
edition="",
|
||||
environment={'EDITION': 'oss'},
|
||||
),
|
||||
pipeline(
|
||||
name='publish-docker-enterprise-{}'.format(mode),
|
||||
trigger=trigger,
|
||||
steps=publish_image_steps(
|
||||
edition='enterprise', mode=mode, docker_repo='grafana-enterprise'
|
||||
),
|
||||
edition="",
|
||||
environment={'EDITION': 'enterprise'},
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
def publish_image_pipelines_security():
|
||||
mode='security'
|
||||
mode = 'security'
|
||||
trigger = {
|
||||
'event': ['promote'],
|
||||
'target': [mode],
|
||||
}
|
||||
return [pipeline(
|
||||
name='publish-docker-enterprise-{}'.format(mode), trigger=trigger, steps=publish_image_steps(edition='enterprise', mode=mode, docker_repo='grafana-enterprise'), edition="", environment = {'EDITION': 'enterprise'}
|
||||
),]
|
||||
return [
|
||||
pipeline(
|
||||
name='publish-docker-enterprise-{}'.format(mode),
|
||||
trigger=trigger,
|
||||
steps=publish_image_steps(
|
||||
edition='enterprise', mode=mode, docker_repo='grafana-enterprise'
|
||||
),
|
||||
edition="",
|
||||
environment={'EDITION': 'enterprise'},
|
||||
),
|
||||
]
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
load(
|
||||
'scripts/drone/steps/lib.star',
|
||||
'build_image',
|
||||
'compile_build_cmd'
|
||||
)
|
||||
load('scripts/drone/steps/lib.star', 'build_image', 'compile_build_cmd')
|
||||
|
||||
load(
|
||||
'scripts/drone/utils/utils.star',
|
||||
@@ -19,12 +15,11 @@ trigger = {
|
||||
'docs/**',
|
||||
'latest.json',
|
||||
],
|
||||
'include': [
|
||||
'scripts/**/*.sh'
|
||||
],
|
||||
'include': ['scripts/**/*.sh'],
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def shellcheck_step():
|
||||
return {
|
||||
'name': 'shellcheck',
|
||||
@@ -37,6 +32,7 @@ def shellcheck_step():
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
def shellcheck_pipeline():
|
||||
environment = {'EDITION': 'oss'}
|
||||
steps = [
|
||||
@@ -44,6 +40,10 @@ def shellcheck_pipeline():
|
||||
shellcheck_step(),
|
||||
]
|
||||
return pipeline(
|
||||
name='pr-shellcheck', edition="oss", trigger=trigger, services=[], steps=steps, environment=environment,
|
||||
name='pr-shellcheck',
|
||||
edition="oss",
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
|
||||
@@ -15,28 +15,71 @@ load(
|
||||
load(
|
||||
'scripts/drone/utils/utils.star',
|
||||
'pipeline',
|
||||
'with_deps',
|
||||
)
|
||||
|
||||
def test_backend(trigger, ver_mode, edition="oss"):
|
||||
environment = {'EDITION': edition}
|
||||
init_steps = []
|
||||
if edition != 'oss':
|
||||
init_steps.extend([clone_enterprise_step(ver_mode), download_grabpl_step(), init_enterprise_step(ver_mode),])
|
||||
init_steps.extend([
|
||||
|
||||
def test_backend(trigger, ver_mode, committish):
|
||||
environment = {'EDITION': 'oss'}
|
||||
|
||||
steps = [
|
||||
identify_runner_step(),
|
||||
compile_build_cmd(edition),
|
||||
verify_gen_cue_step(edition),
|
||||
verify_gen_jsonnet_step(edition),
|
||||
compile_build_cmd(edition='oss'),
|
||||
verify_gen_cue_step(),
|
||||
verify_gen_jsonnet_step(),
|
||||
wire_install_step(),
|
||||
])
|
||||
test_steps = [
|
||||
test_backend_step(edition),
|
||||
test_backend_integration_step(edition),
|
||||
test_backend_step(),
|
||||
test_backend_integration_step(),
|
||||
]
|
||||
|
||||
pipeline_name = '{}-test-backend'.format(ver_mode)
|
||||
if ver_mode in ("release-branch", "release"):
|
||||
pipeline_name = '{}-{}-test-backend'.format(ver_mode, edition)
|
||||
pipeline_name = '{}-{}-test-backend'.format(ver_mode, 'oss')
|
||||
|
||||
return pipeline(
|
||||
name=pipeline_name, edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment
|
||||
name=pipeline_name,
|
||||
edition='oss',
|
||||
trigger=trigger,
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
|
||||
def test_backend_enterprise(trigger, ver_mode, committish, edition="enterprise"):
|
||||
environment = {'EDITION': edition}
|
||||
|
||||
steps = (
|
||||
[
|
||||
clone_enterprise_step(committish),
|
||||
download_grabpl_step(),
|
||||
init_enterprise_step(ver_mode),
|
||||
identify_runner_step(),
|
||||
compile_build_cmd(edition),
|
||||
]
|
||||
+ with_deps(
|
||||
[
|
||||
verify_gen_cue_step(),
|
||||
verify_gen_jsonnet_step(),
|
||||
],
|
||||
[
|
||||
'init-enterprise',
|
||||
],
|
||||
)
|
||||
+ [
|
||||
wire_install_step(),
|
||||
test_backend_step(),
|
||||
test_backend_integration_step(),
|
||||
]
|
||||
)
|
||||
|
||||
pipeline_name = '{}-test-backend'.format(ver_mode)
|
||||
if ver_mode in ("release-branch", "release"):
|
||||
pipeline_name = '{}-{}-test-backend'.format(ver_mode, edition)
|
||||
|
||||
return pipeline(
|
||||
name=pipeline_name,
|
||||
edition=edition,
|
||||
trigger=trigger,
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -12,25 +12,59 @@ load(
|
||||
load(
|
||||
'scripts/drone/utils/utils.star',
|
||||
'pipeline',
|
||||
'with_deps',
|
||||
)
|
||||
|
||||
def test_frontend(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([
|
||||
|
||||
def test_frontend(trigger, ver_mode, committish):
|
||||
environment = {'EDITION': 'oss'}
|
||||
|
||||
steps = [
|
||||
identify_runner_step(),
|
||||
download_grabpl_step(),
|
||||
yarn_install_step(edition),
|
||||
])
|
||||
test_steps = [
|
||||
betterer_frontend_step(edition),
|
||||
test_frontend_step(edition),
|
||||
yarn_install_step(),
|
||||
betterer_frontend_step(edition='oss'),
|
||||
test_frontend_step(edition='oss'),
|
||||
]
|
||||
|
||||
pipeline_name = '{}-test-frontend'.format(ver_mode)
|
||||
if ver_mode in ("release-branch", "release"):
|
||||
pipeline_name = '{}-{}-test-frontend'.format(ver_mode, 'oss')
|
||||
|
||||
return pipeline(
|
||||
name=pipeline_name,
|
||||
edition='oss',
|
||||
trigger=trigger,
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
|
||||
def test_frontend_enterprise(trigger, ver_mode, committish, edition='enterprise'):
|
||||
environment = {'EDITION': edition}
|
||||
|
||||
steps = (
|
||||
[
|
||||
clone_enterprise_step(committish),
|
||||
init_enterprise_step(ver_mode),
|
||||
identify_runner_step(),
|
||||
download_grabpl_step(),
|
||||
]
|
||||
+ with_deps([yarn_install_step()], ['init-enterprise'])
|
||||
+ [
|
||||
betterer_frontend_step(edition),
|
||||
test_frontend_step(edition),
|
||||
]
|
||||
)
|
||||
|
||||
pipeline_name = '{}-test-frontend'.format(ver_mode)
|
||||
if ver_mode in ("release-branch", "release"):
|
||||
pipeline_name = '{}-{}-test-frontend'.format(ver_mode, edition)
|
||||
|
||||
return pipeline(
|
||||
name=pipeline_name, edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps, environment=environment,
|
||||
name=pipeline_name,
|
||||
edition=edition,
|
||||
trigger=trigger,
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -9,7 +9,9 @@ load(
|
||||
)
|
||||
|
||||
trigger = {
|
||||
'event': ['push',],
|
||||
'event': [
|
||||
'push',
|
||||
],
|
||||
'branch': 'main',
|
||||
'paths': {
|
||||
'exclude': [
|
||||
@@ -20,10 +22,22 @@ trigger = {
|
||||
},
|
||||
}
|
||||
|
||||
def enterprise_downstream_pipeline(edition, ver_mode):
|
||||
environment = {'EDITION': edition}
|
||||
steps = [enterprise_downstream_step(edition, ver_mode)]
|
||||
deps = ['main-build-e2e-publish', 'main-integration-tests']
|
||||
|
||||
def enterprise_downstream_pipeline():
|
||||
environment = {'EDITION': 'oss'}
|
||||
steps = [
|
||||
enterprise_downstream_step(ver_mode='main'),
|
||||
]
|
||||
deps = [
|
||||
'main-build-e2e-publish',
|
||||
'main-integration-tests',
|
||||
]
|
||||
return pipeline(
|
||||
name='main-trigger-downstream', edition=edition, trigger=trigger, services=[], steps=steps, depends_on=deps, environment=environment,
|
||||
)
|
||||
name='main-trigger-downstream',
|
||||
edition='oss',
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=steps,
|
||||
depends_on=deps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -11,6 +11,7 @@ load(
|
||||
'pipeline',
|
||||
)
|
||||
|
||||
|
||||
def verify_drone(trigger, ver_mode):
|
||||
environment = {'EDITION': 'oss'}
|
||||
steps = [
|
||||
@@ -20,5 +21,10 @@ def verify_drone(trigger, ver_mode):
|
||||
lint_drone_step(),
|
||||
]
|
||||
return pipeline(
|
||||
name='{}-verify-drone'.format(ver_mode), edition="oss", trigger=trigger, services=[], steps=steps, environment=environment,
|
||||
name='{}-verify-drone'.format(ver_mode),
|
||||
edition="oss",
|
||||
trigger=trigger,
|
||||
services=[],
|
||||
steps=steps,
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
load(
|
||||
'scripts/drone/steps/lib.star',
|
||||
'grabpl_version',
|
||||
'wix_image',
|
||||
'identify_runner_step',
|
||||
'get_windows_steps',
|
||||
)
|
||||
|
||||
load(
|
||||
@@ -10,126 +8,21 @@ load(
|
||||
'pipeline',
|
||||
)
|
||||
|
||||
load('scripts/drone/vault.star', 'from_secret', 'prerelease_bucket', 'github_token')
|
||||
|
||||
def windows(trigger, edition, ver_mode):
|
||||
environment = {'EDITION': edition}
|
||||
init_cmds = []
|
||||
sfx = ''
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
sfx = '-{}'.format(edition)
|
||||
else:
|
||||
init_cmds.extend([
|
||||
'$$ProgressPreference = "SilentlyContinue"',
|
||||
'Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/{}/windows/grabpl.exe -OutFile grabpl.exe'.format(
|
||||
grabpl_version),
|
||||
])
|
||||
steps = [
|
||||
{
|
||||
'name': 'windows-init',
|
||||
'image': wix_image,
|
||||
'commands': init_cmds,
|
||||
},
|
||||
]
|
||||
if (ver_mode == 'main' and (edition not in ('enterprise', 'enterprise2'))) or ver_mode in (
|
||||
'release', 'release-branch',
|
||||
):
|
||||
bucket = '%PRERELEASE_BUCKET%/artifacts/downloads'
|
||||
if ver_mode == 'release':
|
||||
ver_part = '${DRONE_TAG}'
|
||||
dir = 'release'
|
||||
else:
|
||||
dir = 'main'
|
||||
bucket = 'grafana-downloads'
|
||||
build_no = 'DRONE_BUILD_NUMBER'
|
||||
ver_part = '--build-id $$env:{}'.format(build_no)
|
||||
installer_commands = [
|
||||
'$$gcpKey = $$env:GCP_KEY',
|
||||
'[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json',
|
||||
# gcloud fails to read the file unless converted with dos2unix
|
||||
'dos2unix gcpkey.json',
|
||||
'gcloud auth activate-service-account --key-file=gcpkey.json',
|
||||
'rm gcpkey.json',
|
||||
'cp C:\\App\\nssm-2.24.zip .',
|
||||
]
|
||||
if (ver_mode == 'main' and (edition not in ('enterprise', 'enterprise2'))) or ver_mode in (
|
||||
'release',
|
||||
):
|
||||
installer_commands.extend([
|
||||
'.\\grabpl.exe windows-installer --edition {} {}'.format(edition, ver_part),
|
||||
'$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]',
|
||||
])
|
||||
if ver_mode == 'main':
|
||||
installer_commands.extend([
|
||||
'gsutil cp $$fname gs://{}/{}/{}/'.format(bucket, edition, dir),
|
||||
'gsutil cp "$$fname.sha256" gs://{}/{}/{}/'.format(bucket, edition, dir),
|
||||
])
|
||||
else:
|
||||
installer_commands.extend([
|
||||
'gsutil cp $$fname gs://{}/{}/{}/{}/'.format(bucket, ver_part, edition, dir),
|
||||
'gsutil cp "$$fname.sha256" gs://{}/{}/{}/{}/'.format(bucket, ver_part, edition, dir),
|
||||
])
|
||||
steps.append({
|
||||
'name': 'build-windows-installer',
|
||||
'image': wix_image,
|
||||
'depends_on': [
|
||||
'windows-init',
|
||||
],
|
||||
'environment': {
|
||||
'GCP_KEY': from_secret('gcp_key'),
|
||||
'PRERELEASE_BUCKET': from_secret(prerelease_bucket),
|
||||
'GITHUB_TOKEN': from_secret('github_token')
|
||||
},
|
||||
'commands': installer_commands,
|
||||
})
|
||||
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
if ver_mode == 'release':
|
||||
committish = '${DRONE_TAG}'
|
||||
elif ver_mode == 'release-branch':
|
||||
committish = '$$env:DRONE_BRANCH'
|
||||
else:
|
||||
committish = '$$env:DRONE_COMMIT'
|
||||
# For enterprise, we have to clone both OSS and enterprise and merge the latter into the former
|
||||
download_grabpl_step_cmds = [
|
||||
'$$ProgressPreference = "SilentlyContinue"',
|
||||
'Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/{}/windows/grabpl.exe -OutFile grabpl.exe'.format(
|
||||
grabpl_version),
|
||||
]
|
||||
clone_cmds = [
|
||||
'git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"',
|
||||
]
|
||||
clone_cmds.extend([
|
||||
'cd grafana-enterprise',
|
||||
'git checkout {}'.format(committish),
|
||||
])
|
||||
steps.insert(0, {
|
||||
'name': 'clone',
|
||||
'image': wix_image,
|
||||
'environment': {
|
||||
'GITHUB_TOKEN': from_secret(github_token),
|
||||
},
|
||||
'commands': download_grabpl_step_cmds + clone_cmds,
|
||||
})
|
||||
steps[1]['depends_on'] = [
|
||||
'clone',
|
||||
]
|
||||
steps[1]['commands'].extend([
|
||||
# Need to move grafana-enterprise out of the way, so directory is empty and can be cloned into
|
||||
'cp -r grafana-enterprise C:\\App\\grafana-enterprise',
|
||||
'rm -r -force grafana-enterprise',
|
||||
'cp grabpl.exe C:\\App\\grabpl.exe',
|
||||
'rm -force grabpl.exe',
|
||||
'C:\\App\\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\\App\\grafana-enterprise',
|
||||
'cp C:\\App\\grabpl.exe grabpl.exe',
|
||||
])
|
||||
if 'environment' in steps[1]:
|
||||
steps[1]['environment'] + {'GITHUB_TOKEN': from_secret(github_token)}
|
||||
else:
|
||||
steps[1]['environment'] = {'GITHUB_TOKEN': from_secret(github_token)}
|
||||
|
||||
return pipeline(
|
||||
name='main-windows', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']),
|
||||
steps=[identify_runner_step('windows')] + steps,
|
||||
depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests'], platform='windows', environment=environment,
|
||||
name='main-windows',
|
||||
edition=edition,
|
||||
trigger=dict(trigger, repo=['grafana/grafana']),
|
||||
steps=get_windows_steps(edition, ver_mode),
|
||||
depends_on=[
|
||||
'main-test-frontend',
|
||||
'main-test-backend',
|
||||
'main-build-e2e-publish',
|
||||
'main-integration-tests',
|
||||
],
|
||||
platform='windows',
|
||||
environment=environment,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user