Skip to content

N
nexpie-grafana-theme
Commit 52f79c36 by Arve Knudsen Committed by GitHub
Options

Drone: Fix race conditions between Enterprise and Enterprise2 (#30076) 

* Drone: Fix race conditions between Enterprise and Enterprise2

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent 2d803ee5
Showing with 76 additions and 37 deletions
scripts/master.star
...@@ -10,6 +10,7 @@ load( ...@@ -10,6 +10,7 @@ load(
'build_backend_step', 'build_backend_step',
'build_frontend_step', 'build_frontend_step',
'build_plugins_step', 'build_plugins_step',
'gen_version_step',
'package_step', 'package_step',
'e2e_tests_server_step', 'e2e_tests_server_step',
'e2e_tests_step', 'e2e_tests_step',
...@@ -37,21 +38,36 @@ ver_mode = 'master' ...@@ -37,21 +38,36 @@ ver_mode = 'master'
def get_steps(edition, is_downstream=False): def get_steps(edition, is_downstream=False):
publish = edition != 'enterprise' or is_downstream publish = edition != 'enterprise' or is_downstream
include_enterprise2 = edition == 'enterprise'
steps = [ steps = [
enterprise_downstream_step(edition=edition), enterprise_downstream_step(edition=edition),
lint_backend_step(edition=edition), lint_backend_step(edition=edition),
codespell_step(), codespell_step(),
shellcheck_step(), shellcheck_step(),
dashboard_schemas_check(), dashboard_schemas_check(),
test_backend_step(), test_backend_step(edition=edition),
test_frontend_step(), test_frontend_step(),
frontend_metrics_step(edition=edition), frontend_metrics_step(edition=edition),
build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), build_backend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), build_frontend_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
build_plugins_step(edition=edition, sign=True), build_plugins_step(edition=edition, sign=True),
]
# Have to insert Enterprise2 steps before they're depended on (in the gen-version step)
if include_enterprise2:
edition2 = 'enterprise2'
steps.extend([
lint_backend_step(edition=edition2),
test_backend_step(edition=edition2),
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream),
])
# Insert remaining steps
steps.extend([
gen_version_step(ver_mode=ver_mode, is_downstream=is_downstream, include_enterprise2=include_enterprise2),
package_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), package_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
e2e_tests_server_step(edition=edition), e2e_tests_server_step(edition=edition),
e2e_tests_step(), e2e_tests_step(edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode), build_storybook_step(edition=edition, ver_mode=ver_mode),
publish_storybook_step(edition=edition, ver_mode=ver_mode), publish_storybook_step(edition=edition, ver_mode=ver_mode),
build_frontend_docs_step(edition=edition), build_frontend_docs_step(edition=edition),
...@@ -63,17 +79,14 @@ def get_steps(edition, is_downstream=False): ...@@ -63,17 +79,14 @@ def get_steps(edition, is_downstream=False):
release_canary_npm_packages_step(edition), release_canary_npm_packages_step(edition),
upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream), upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
deploy_to_kubernetes_step(edition=edition, is_downstream=is_downstream), deploy_to_kubernetes_step(edition=edition, is_downstream=is_downstream),
] ])
if edition == 'enterprise': if include_enterprise2:
build_tags = ['enterprise2'] edition2 = 'enterprise2'
steps.extend([ steps.extend([
lint_backend_step(edition=edition, build_tags=build_tags), package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream),
test_backend_step(build_tags=build_tags), e2e_tests_server_step(edition=edition2, port=3002),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream, build_tags=build_tags), e2e_tests_step(edition=edition2, port=3002),
package_step(edition=edition, ver_mode=ver_mode, variants=['linux-x64'], is_downstream=is_downstream, build_tags=build_tags), upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream),
e2e_tests_server_step(edition=edition, build_tags=build_tags, port=3002),
e2e_tests_step(build_tags=build_tags, port=3002),
upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream, build_tags=build_tags),
]) ])
windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream) windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream)
......
scripts/pr.star
...@@ -10,6 +10,7 @@ load( ...@@ -10,6 +10,7 @@ load(
'build_backend_step', 'build_backend_step',
'build_frontend_step', 'build_frontend_step',
'build_plugins_step', 'build_plugins_step',
'gen_version_step',
'package_step', 'package_step',
'e2e_tests_server_step', 'e2e_tests_server_step',
'e2e_tests_step', 'e2e_tests_step',
...@@ -30,19 +31,36 @@ ver_mode = 'pr' ...@@ -30,19 +31,36 @@ ver_mode = 'pr'
def pr_pipelines(edition): def pr_pipelines(edition):
services = integration_test_services() services = integration_test_services()
variants = ['linux-x64', 'linux-x64-musl', 'osx64', 'win64',] variants = ['linux-x64', 'linux-x64-musl', 'osx64', 'win64',]
include_enterprise2 = edition == 'enterprise'
steps = [ steps = [
lint_backend_step(edition=edition), lint_backend_step(edition=edition),
codespell_step(), codespell_step(),
shellcheck_step(), shellcheck_step(),
dashboard_schemas_check(), dashboard_schemas_check(),
test_backend_step(), test_backend_step(edition=edition),
test_frontend_step(), test_frontend_step(),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants), build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
build_frontend_step(edition=edition, ver_mode=ver_mode), build_frontend_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition), build_plugins_step(edition=edition),
]
# Have to insert Enterprise2 steps before they're depended on (in the gen-version step)
if include_enterprise2:
edition2 = 'enterprise2'
steps.append(benchmark_ldap_step())
services.append(ldap_service())
steps.extend([
lint_backend_step(edition=edition2),
test_backend_step(edition=edition2),
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
])
# Insert remaining steps
steps.extend([
gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2),
package_step(edition=edition, ver_mode=ver_mode, variants=variants), package_step(edition=edition, ver_mode=ver_mode, variants=variants),
e2e_tests_server_step(edition=edition), e2e_tests_server_step(edition=edition),
e2e_tests_step(), e2e_tests_step(edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode), build_storybook_step(edition=edition, ver_mode=ver_mode),
build_frontend_docs_step(edition=edition), build_frontend_docs_step(edition=edition),
build_docs_website_step(), build_docs_website_step(),
...@@ -50,18 +68,13 @@ def pr_pipelines(edition): ...@@ -50,18 +68,13 @@ 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',]),
postgres_integration_tests_step(), postgres_integration_tests_step(),
mysql_integration_tests_step(), mysql_integration_tests_step(),
] ])
if edition == 'enterprise':
steps.append(benchmark_ldap_step()) if include_enterprise2:
services.append(ldap_service())
build_tags = ['enterprise2']
steps.extend([ steps.extend([
lint_backend_step(edition=edition, build_tags=build_tags), package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
test_backend_step(build_tags=build_tags), e2e_tests_server_step(edition=edition2, port=3002),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=['linux-x64'], build_tags=build_tags), e2e_tests_step(edition=edition2, port=3002),
package_step(edition=edition, ver_mode=ver_mode, variants=['linux-x64'], build_tags=build_tags),
e2e_tests_server_step(edition=edition, build_tags=build_tags, port=3002),
e2e_tests_step(build_tags=build_tags, port=3002),
]) ])
trigger = { trigger = {
......
scripts/release.star
...@@ -13,6 +13,7 @@ load( ...@@ -13,6 +13,7 @@ load(
'build_backend_step', 'build_backend_step',
'build_frontend_step', 'build_frontend_step',
'build_plugins_step', 'build_plugins_step',
'gen_version_step',
'package_step', 'package_step',
'e2e_tests_server_step', 'e2e_tests_server_step',
'e2e_tests_step', 'e2e_tests_step',
...@@ -59,27 +60,42 @@ def release_npm_packages_step(edition, ver_mode): ...@@ -59,27 +60,42 @@ def release_npm_packages_step(edition, ver_mode):
def get_steps(edition, ver_mode): def get_steps(edition, ver_mode):
should_publish = ver_mode in ('release', 'test-release',) should_publish = ver_mode in ('release', 'test-release',)
should_upload = should_publish or ver_mode in ('release-branch',) should_upload = should_publish or ver_mode in ('release-branch',)
include_enterprise2 = edition == 'enterprise'
steps = [ steps = [
lint_backend_step(edition=edition), lint_backend_step(edition=edition),
codespell_step(), codespell_step(),
shellcheck_step(), shellcheck_step(),
dashboard_schemas_check(), dashboard_schemas_check(),
test_backend_step(), test_backend_step(edition=edition),
test_frontend_step(), test_frontend_step(),
build_backend_step(edition=edition, ver_mode=ver_mode), build_backend_step(edition=edition, ver_mode=ver_mode),
build_frontend_step(edition=edition, ver_mode=ver_mode), build_frontend_step(edition=edition, ver_mode=ver_mode),
build_plugins_step(edition=edition, sign=True), build_plugins_step(edition=edition, sign=True),
]
# Have to insert Enterprise2 steps before they're depended on (in the gen-version step)
if include_enterprise2:
edition2 = 'enterprise2'
steps.extend([
lint_backend_step(edition=edition2),
test_backend_step(edition=edition2),
build_backend_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
])
# Insert remaining steps
steps.extend([
gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2),
package_step(edition=edition, ver_mode=ver_mode), package_step(edition=edition, ver_mode=ver_mode),
e2e_tests_server_step(edition=edition), e2e_tests_server_step(edition=edition),
e2e_tests_step(), e2e_tests_step(edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode), build_storybook_step(edition=edition, ver_mode=ver_mode),
copy_packages_for_docker_step(), copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish), build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish),
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish), build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=should_publish),
postgres_integration_tests_step(), postgres_integration_tests_step(),
mysql_integration_tests_step(), mysql_integration_tests_step(),
] ])
if should_upload: if should_upload:
steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode)) steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
if should_publish: if should_publish:
...@@ -89,18 +105,15 @@ def get_steps(edition, ver_mode): ...@@ -89,18 +105,15 @@ def get_steps(edition, 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': if include_enterprise2:
build_tags = ['enterprise2'] edition2 = 'enterprise2'
steps.extend([ steps.extend([
lint_backend_step(edition=edition, build_tags=build_tags), package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
test_backend_step(build_tags=build_tags), e2e_tests_server_step(edition=edition2, port=3002),
build_backend_step(edition=edition, ver_mode=ver_mode, variants=['linux-x64'], build_tags=build_tags), e2e_tests_step(edition=edition2, port=3002),
package_step(edition=edition, ver_mode=ver_mode, variants=['linux-x64'], build_tags=build_tags),
e2e_tests_server_step(edition=edition, build_tags=build_tags, port=3002),
e2e_tests_step(build_tags=build_tags, port=3002),
]) ])
if should_upload: if should_upload:
steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode, build_tags=build_tags)) steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))
return steps, windows_steps return steps, windows_steps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment