IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 09:26:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove e2e tests on enterprise2 (#42640)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2021-12-02 14:55:23 +02:00 committed by GitHub
parent 5cbb4a0a2d
commit dc627a3d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
.drone.yml
View File

@ -1788,7 +1788,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
@ -1799,10 +1799,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:
@ -1834,65 +1831,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
@ -1903,10 +1845,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:
@ -2825,7 +2764,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
@ -2836,10 +2775,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:
@ -2871,65 +2807,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
@ -2940,10 +2821,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:
@ -3927,7 +3805,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
@ -3938,10 +3816,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:
@ -3973,65 +3848,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
@ -4042,10 +3862,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:
@ -4302,6 +4119,6 @@ kind: secret
name: prerelease_bucket
---
kind: signature
hmac: 63011a7e74dab6811078cf83929581cc25cc8a2133c388a93b8284b98de1d379
hmac: 173e39ecf08a1c29f188e30e65c362e9ccb47776411c6e7cd2365b2fe18dfeb4
...

6
scripts/drone/pipelines/main.star
View File

@ -118,12 +118,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, ver_mode=ver_mode)
])

5
scripts/drone/pipelines/pr.star
View File

@ -111,11 +111,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('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 = {

8
scripts/drone/pipelines/release.star
View File

@ -128,6 +128,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(),
@ -146,7 +147,6 @@ def get_steps(edition, ver_mode):
ensure_cuetsified_step(),
]
edition2 = 'enterprise2'
if include_enterprise2:
build_steps.extend([
lint_backend_step(edition=edition2),
@ -191,14 +191,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, ver_mode=ver_mode),
])
if should_upload:

30
scripts/drone/steps/lib.star
View File

@ -295,12 +295,20 @@ def upload_cdn_step(edition, ver_mode):
else:
bucket = "$${PRERELEASE_BUCKET}/artifacts/static-assets"
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)
@ -925,21 +933,27 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
packages_bucket = ' --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads' + enterprise2_suffix(edition)
cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)
dependencies = [
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'),