From 5f7ac314fda8f417a69ea1edf158893fff861213 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Thu, 2 Dec 2021 15:52:00 +0200 Subject: [PATCH] Remove e2e tests on enterprise2 (#42640) (#42649) --- .drone.yml | 209 ++------------------------- scripts/drone/pipelines/main.star | 6 - scripts/drone/pipelines/pr.star | 7 +- scripts/drone/pipelines/release.star | 8 +- scripts/drone/steps/lib.star | 38 +++-- 5 files changed, 41 insertions(+), 227 deletions(-) diff --git a/.drone.yml b/.drone.yml index a5842c91575..282ece0a950 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1760,7 +1760,7 @@ steps: - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" depends_on: - - end-to-end-tests-server + - package environment: GCP_GRAFANA_UPLOAD_KEY: from_secret: gcp_key @@ -1771,10 +1771,7 @@ steps: - commands: - ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads depends_on: - - end-to-end-tests-dashboards-suite - - end-to-end-tests-panels-suite - - end-to-end-tests-smoke-tests-suite - - end-to-end-tests-various-suite + - package - redis-integration-tests - memcached-integration-tests environment: @@ -1806,65 +1803,10 @@ steps: from_secret: grafana_api_key image: grafana/build-container:1.4.8 name: package-enterprise2 -- commands: - - ./e2e/start-server - depends_on: - - package-enterprise2 - detach: true - environment: - PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz - PORT: 3002 - RUNDIR: e2e/tmp-grafana-enterprise2 - image: grafana/build-container:1.4.8 - name: end-to-end-tests-server-enterprise2 -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-dashboards-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite smoke-tests-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-smoke-tests-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite panels-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-panels-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite various-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-various-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" depends_on: - - end-to-end-tests-server-enterprise2 + - package-enterprise2 environment: GCP_GRAFANA_UPLOAD_KEY: from_secret: gcp_key @@ -1875,10 +1817,7 @@ steps: - commands: - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2 depends_on: - - end-to-end-tests-dashboards-suite-enterprise2 - - end-to-end-tests-panels-suite-enterprise2 - - end-to-end-tests-smoke-tests-suite-enterprise2 - - end-to-end-tests-various-suite-enterprise2 + - package-enterprise2 - redis-integration-tests - memcached-integration-tests environment: @@ -2797,7 +2736,7 @@ steps: - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" depends_on: - - end-to-end-tests-server + - package environment: GCP_GRAFANA_UPLOAD_KEY: from_secret: gcp_key @@ -2808,10 +2747,7 @@ steps: - commands: - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads-test depends_on: - - end-to-end-tests-dashboards-suite - - end-to-end-tests-panels-suite - - end-to-end-tests-smoke-tests-suite - - end-to-end-tests-various-suite + - package - redis-integration-tests - memcached-integration-tests environment: @@ -2843,65 +2779,10 @@ steps: from_secret: grafana_api_key image: grafana/build-container:1.4.8 name: package-enterprise2 -- commands: - - ./e2e/start-server - depends_on: - - package-enterprise2 - detach: true - environment: - PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz - PORT: 3002 - RUNDIR: e2e/tmp-grafana-enterprise2 - image: grafana/build-container:1.4.8 - name: end-to-end-tests-server-enterprise2 -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-dashboards-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite smoke-tests-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-smoke-tests-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite panels-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-panels-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite various-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-various-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" depends_on: - - end-to-end-tests-server-enterprise2 + - package-enterprise2 environment: GCP_GRAFANA_UPLOAD_KEY: from_secret: gcp_key @@ -2912,10 +2793,7 @@ steps: - commands: - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-test depends_on: - - end-to-end-tests-dashboards-suite-enterprise2 - - end-to-end-tests-panels-suite-enterprise2 - - end-to-end-tests-smoke-tests-suite-enterprise2 - - end-to-end-tests-various-suite-enterprise2 + - package-enterprise2 - redis-integration-tests - memcached-integration-tests environment: @@ -3899,7 +3777,7 @@ steps: - commands: - ./bin/grabpl upload-cdn --edition enterprise --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" depends_on: - - end-to-end-tests-server + - package environment: GCP_GRAFANA_UPLOAD_KEY: from_secret: gcp_key @@ -3910,10 +3788,7 @@ steps: - commands: - ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads depends_on: - - end-to-end-tests-dashboards-suite - - end-to-end-tests-panels-suite - - end-to-end-tests-smoke-tests-suite - - end-to-end-tests-various-suite + - package - redis-integration-tests - memcached-integration-tests environment: @@ -3945,65 +3820,10 @@ steps: from_secret: grafana_api_key image: grafana/build-container:1.4.8 name: package-enterprise2 -- commands: - - ./e2e/start-server - depends_on: - - package-enterprise2 - detach: true - environment: - PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz - PORT: 3002 - RUNDIR: e2e/tmp-grafana-enterprise2 - image: grafana/build-container:1.4.8 - name: end-to-end-tests-server-enterprise2 -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite dashboards-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-dashboards-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite smoke-tests-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-smoke-tests-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite panels-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-panels-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress -- commands: - - ./bin/grabpl e2e-tests --port 3002 --suite various-suite --tries 3 - depends_on: - - cypress - environment: - HOST: end-to-end-tests-server-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - name: end-to-end-tests-various-suite-enterprise2 - volumes: - - name: cypress_cache - path: /root/.cache/Cypress - commands: - ./bin/grabpl upload-cdn --edition enterprise2 --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" depends_on: - - end-to-end-tests-server-enterprise2 + - package-enterprise2 environment: GCP_GRAFANA_UPLOAD_KEY: from_secret: gcp_key @@ -4014,10 +3834,7 @@ steps: - commands: - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2 depends_on: - - end-to-end-tests-dashboards-suite-enterprise2 - - end-to-end-tests-panels-suite-enterprise2 - - end-to-end-tests-smoke-tests-suite-enterprise2 - - end-to-end-tests-various-suite-enterprise2 + - package-enterprise2 - redis-integration-tests - memcached-integration-tests environment: @@ -4195,6 +4012,6 @@ kind: secret name: prerelease_bucket --- kind: signature -hmac: 98194804bc23be84848e25afddb618133c951e497795a0f5f5ff9b524b468d3a +hmac: cc3299d9dcd805f37ccd5e224ac2973680d95bc085549009c8dc9be1a54a86dc ... diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star index 3f480f72e82..2cd25d3866a 100644 --- a/scripts/drone/pipelines/main.star +++ b/scripts/drone/pipelines/main.star @@ -116,12 +116,6 @@ def get_steps(edition, is_downstream=False): edition2 = 'enterprise2' steps.extend([ package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64'], is_downstream=is_downstream), - e2e_tests_server_step(edition=edition2, port=3002), - e2e_tests_step(edition=edition2, port=3002), - e2e_tests_step('dashboards-suite', edition=edition2, port=3002), - e2e_tests_step('smoke-tests-suite', edition=edition2, port=3002), - e2e_tests_step('panels-suite', edition=edition2, port=3002), - e2e_tests_step('various-suite', edition=edition2, port=3002), upload_packages_step(edition=edition2, ver_mode=ver_mode, is_downstream=is_downstream), upload_cdn_step(edition=edition2) ]) diff --git a/scripts/drone/pipelines/pr.star b/scripts/drone/pipelines/pr.star index 6cd87828139..91a55d04b39 100644 --- a/scripts/drone/pipelines/pr.star +++ b/scripts/drone/pipelines/pr.star @@ -40,6 +40,7 @@ load( load( 'scripts/drone/utils/utils.star', + 'notify_pipeline', 'pipeline', ) @@ -108,12 +109,6 @@ def pr_pipelines(edition): ]) build_steps.extend([ package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']), - e2e_tests_server_step(edition=edition2, port=3002), - e2e_tests_step(edition=edition2, port=3002), - e2e_tests_step('dashboards-suite', edition=edition2, port=3002), - e2e_tests_step('smoke-tests-suite', edition=edition2, port=3002), - e2e_tests_step('panels-suite', edition=edition2, port=3002), - e2e_tests_step('various-suite', edition=edition2, port=3002), ]) trigger = { diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index bb50693ae4e..6213749fb05 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -126,6 +126,7 @@ def get_steps(edition, ver_mode): should_publish = ver_mode in ('release', 'test-release',) should_upload = should_publish or ver_mode in ('release-branch',) include_enterprise2 = edition == 'enterprise' + edition2 = 'enterprise2' build_steps = [ codespell_step(), @@ -144,7 +145,6 @@ def get_steps(edition, ver_mode): ensure_cuetsified_step(), ] - edition2 = 'enterprise2' if include_enterprise2: build_steps.extend([ lint_backend_step(edition=edition2), @@ -189,14 +189,8 @@ def get_steps(edition, ver_mode): windows_package_steps = get_windows_steps(edition=edition, ver_mode=ver_mode) if include_enterprise2: - edition2 = 'enterprise2' publish_steps.extend([ package_step(edition=edition2, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=['linux-x64']), - e2e_tests_server_step(edition=edition2, port=3002), - e2e_tests_step('dashboards-suite', edition=edition2, port=3002, tries=3), - e2e_tests_step('smoke-tests-suite', edition=edition2, port=3002, tries=3), - e2e_tests_step('panels-suite', edition=edition2, port=3002, tries=3), - e2e_tests_step('various-suite', edition=edition2, port=3002, tries=3), upload_cdn_step(edition=edition2), ]) if should_upload: diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index b5ab61dafa9..9e565879ec9 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -290,12 +290,20 @@ def publish_storybook_step(edition, ver_mode): def upload_cdn_step(edition): + deps = [] + if edition in 'enterprise2': + deps.extend([ + 'package' + enterprise2_suffix(edition), + ]) + else: + deps.extend([ + 'end-to-end-tests-server', + ]) + return { 'name': 'upload-cdn-assets' + enterprise2_suffix(edition), 'image': publish_image, - 'depends_on': [ - 'end-to-end-tests-server' + enterprise2_suffix(edition), - ], + 'depends_on': deps, 'environment': { 'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'), 'PRERELEASE_BUCKET': from_secret(prerelease_bucket) @@ -919,21 +927,27 @@ def upload_packages_step(edition, ver_mode, is_downstream=False): else: cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket) - dependencies = [ - 'end-to-end-tests-dashboards-suite' + enterprise2_suffix(edition), - 'end-to-end-tests-panels-suite' + enterprise2_suffix(edition), - 'end-to-end-tests-smoke-tests-suite' + enterprise2_suffix(edition), - 'end-to-end-tests-various-suite' + enterprise2_suffix(edition), - ] + deps = [] + if edition in 'enterprise2': + deps.extend([ + 'package' + enterprise2_suffix(edition), + ]) + else: + deps.extend([ + 'end-to-end-tests-dashboards-suite' + enterprise2_suffix(edition), + 'end-to-end-tests-panels-suite' + enterprise2_suffix(edition), + 'end-to-end-tests-smoke-tests-suite' + enterprise2_suffix(edition), + 'end-to-end-tests-various-suite' + enterprise2_suffix(edition), + ]) if edition in ('enterprise', 'enterprise2'): - dependencies.append('redis-integration-tests') - dependencies.append('memcached-integration-tests') + deps.append('redis-integration-tests') + deps.append('memcached-integration-tests') return { 'name': 'upload-packages' + enterprise2_suffix(edition), 'image': publish_image, - 'depends_on': dependencies, + 'depends_on': deps, 'environment': { 'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'), 'PRERELEASE_BUCKET': from_secret('prerelease_bucket'),