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

chore(drone): switch to using cypress built image for e2e tests

Browse Source
This commit is contained in:
Timur Olzhabayev
2021-12-28 13:59:20 +01:00
committed by GitHub
parent 80e0dd74d2
commit ec9d6b9ca9
5 changed files with 101 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+97 -137
View File
@@ -188,15 +188,6 @@ steps:
environment: null
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -207,45 +198,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -647,15 +642,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -666,45 +652,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -1358,15 +1348,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -1377,45 +1358,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -1905,15 +1890,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -1926,45 +1902,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -2432,15 +2412,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -2451,45 +2422,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -2953,15 +2928,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -2974,45 +2940,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -3583,15 +3553,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -3602,45 +3563,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -4079,15 +4044,6 @@ steps:
from_secret: grafana_api_key
image: grafana/build-container:1.4.8
name: package
- commands:
- yarn run cypress install
depends_on:
- package
image: grafana/ci-e2e:12.19.0-1
name: cypress
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- ./e2e/start-server
depends_on:
@@ -4100,45 +4056,49 @@ steps:
image: grafana/build-container:1.4.8
name: end-to-end-tests-server
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite smoke-tests-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite panels-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite
volumes:
- name: cypress_cache
path: /root/.cache/Cypress
- commands:
- apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite various-suite --tries 3
depends_on:
- cypress
- package
environment:
HOST: end-to-end-tests-server
image: grafana/ci-e2e:12.19.0-1
image: cypress/included:9.2.0
name: end-to-end-tests-various-suite
volumes:
- name: cypress_cache
@@ -4539,6 +4499,6 @@ kind: secret
name: gcp_upload_artifacts_key
---
kind: signature
hmac: dd4acd4d9a3c87a66abc68a0fc815cf08d334507f9f5df7265a186df1a8410a9
hmac: 0140292b5e609a2db7f55c930a9072d5bd1afa92ebd6043ed10314119413c331
...
scripts/drone/pipelines/main.star
+1 -3
View File
@@ -14,7 +14,6 @@ load(
'build_frontend_step',
'build_plugins_step',
'package_step',
'install_cypress_step',
'e2e_tests_server_step',
'e2e_tests_step',
'e2e_tests_artifacts',
@@ -99,8 +98,7 @@ def get_steps(edition, is_downstream=False):
# Insert remaining steps
build_steps.extend([
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream),
install_cypress_step(),
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, is_downstream=is_downstream),
e2e_tests_server_step(edition=edition),
e2e_tests_step('dashboards-suite', edition=edition),
e2e_tests_step('smoke-tests-suite', edition=edition),
scripts/drone/pipelines/pr.star
-2
View File
@@ -14,7 +14,6 @@ load(
'test_backend_integration_step',
'test_frontend_step',
'package_step',
'install_cypress_step',
'e2e_tests_server_step',
'e2e_tests_step',
'e2e_tests_artifacts',
@@ -93,7 +92,6 @@ def pr_pipelines(edition):
# Insert remaining build_steps
build_steps.extend([
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2, variants=variants),
install_cypress_step(),
e2e_tests_server_step(edition=edition),
e2e_tests_step('dashboards-suite', edition=edition),
e2e_tests_step('smoke-tests-suite', edition=edition),
scripts/drone/pipelines/release.star
-2
View File
@@ -17,7 +17,6 @@ load(
'build_frontend_step',
'build_plugins_step',
'package_step',
'install_cypress_step',
'e2e_tests_server_step',
'e2e_tests_step',
'e2e_tests_artifacts',
@@ -159,7 +158,6 @@ def get_steps(edition, ver_mode):
# Insert remaining steps
build_steps.extend([
package_step(edition=edition, ver_mode=ver_mode, include_enterprise2=include_enterprise2),
install_cypress_step(),
e2e_tests_server_step(edition=edition),
e2e_tests_step('dashboards-suite', edition=edition, tries=3),
e2e_tests_step('smoke-tests-suite', edition=edition, tries=3),
scripts/drone/steps/lib.star
+3 -18
View File
@@ -707,31 +707,15 @@ def e2e_tests_server_step(edition, port=3001):
],
}
def install_cypress_step():
return {
'name': 'cypress',
'image': 'grafana/ci-e2e:12.19.0-1',
'depends_on': [
'package',
],
'commands': [
'yarn run cypress install',
],
'volumes': [{
'name': 'cypress_cache',
'path': '/root/.cache/Cypress'
}],
}
def e2e_tests_step(suite, edition, port=3001, tries=None):
cmd = './bin/grabpl e2e-tests --port {} --suite {}'.format(port, suite)
if tries:
cmd += ' --tries {}'.format(tries)
return {
'name': 'end-to-end-tests-{}'.format(suite) + enterprise2_suffix(edition),
'image': 'grafana/ci-e2e:12.19.0-1',
'image': 'cypress/included:9.2.0',
'depends_on': [
'cypress',
'package',
],
'environment': {
'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition),
@@ -741,6 +725,7 @@ def e2e_tests_step(suite, edition, port=3001, tries=None):
'path': '/root/.cache/Cypress'
}],
'commands': [
'apt-get install -y netcat',
cmd,
],
}