From b414ac5d8c1f2836292297ccf5e4c367d7313225 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Fri, 29 Apr 2022 18:15:40 +0300 Subject: [PATCH] Remove references from pr and main starlark (#48544) --- scripts/drone/pipelines/main.star | 38 ++---------------------------- scripts/drone/pipelines/pr.star | 39 +++++-------------------------- 2 files changed, 8 insertions(+), 69 deletions(-) diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star index 1c1aa5dedca..f7cce1a56b3 100644 --- a/scripts/drone/pipelines/main.star +++ b/scripts/drone/pipelines/main.star @@ -72,7 +72,6 @@ ver_mode = 'main' def get_steps(edition): services = integration_test_services(edition) - include_enterprise2 = edition == 'enterprise' init_steps = [ identify_runner_step(), download_grabpl_step(), @@ -105,22 +104,9 @@ def get_steps(edition): 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 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), e2e_tests_step('dashboards-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) ]) - 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([ 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) ]) - 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) - if edition == 'enterprise': - store_steps = [] - else: - store_steps = [ - store_packages_step(edition=edition, ver_mode=ver_mode), - ] + 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 @@ -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) - if edition == 'enterprise': - services.append(ldap_service()) - integration_test_steps.append(benchmark_ldap_step()) - pipelines = [docs_pipelines(edition, ver_mode, trigger), pipeline( name='main-test', edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps, diff --git a/scripts/drone/pipelines/pr.star b/scripts/drone/pipelines/pr.star index 3ee64bb8df4..01d15886f2a 100644 --- a/scripts/drone/pipelines/pr.star +++ b/scripts/drone/pipelines/pr.star @@ -86,8 +86,7 @@ def pr_test_frontend(): ) -def pr_test_backend(edition): - include_enterprise2 = edition == 'enterprise' +def pr_test_backend(): init_steps = [ identify_runner_step(), download_grabpl_step(), @@ -98,17 +97,10 @@ def pr_test_backend(edition): lint_drone_step(), codespell_step(), shellcheck_step(), - lint_backend_step(edition=edition), - test_backend_step(edition=edition), - test_backend_integration_step(edition=edition), + lint_backend_step(edition="oss"), + test_backend_step(edition="oss"), + 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( 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) volumes = integration_test_services_volumes() variants = ['linux-amd64', 'linux-amd64-musl', 'darwin-amd64', 'windows-amd64', 'armv6', ] - include_enterprise2 = edition == 'enterprise' init_steps = [ identify_runner_step(), download_grabpl_step(), @@ -139,17 +130,9 @@ def pr_pipelines(edition): 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 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), e2e_tests_step('dashboards-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', ]), ]) - 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 [ pr_test_frontend(), - pr_test_backend(edition), + pr_test_backend(), pipeline( name='pr-build-e2e', edition=edition, trigger=trigger, services=[], steps=init_steps + build_steps, ), pipeline(