public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove e2e tests on enterprise2 (#42640) (#42649)

Browse Source
This commit is contained in:
Dimitris Sotirakis
2021-12-02 14:52:00 +01:00
committed by GitHub
parent d4112c3102
commit 5f7ac314fd
5 changed files with 41 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+13 -196
View File
@@ -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
...
scripts/drone/pipelines/main.star
-6
View File
@@ -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)
])
scripts/drone/pipelines/pr.star
+1 -6
View File
@@ -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 = {
scripts/drone/pipelines/release.star
+1 -7
View File
@@ -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:
scripts/drone/steps/lib.star
+26 -12
View File
@@ -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'),