From 52edcff798be02905898c345399ceb0c36276e09 Mon Sep 17 00:00:00 2001 From: dsotirakis Date: Tue, 7 Dec 2021 18:43:20 +0200 Subject: [PATCH] Disable e2e tests --- .drone.yml | 106 +------------------------------------------ scripts/lib.star | 3 -- scripts/release.star | 2 - 3 files changed, 1 insertion(+), 110 deletions(-) diff --git a/.drone.yml b/.drone.yml index d046386a1e6..13b448e849c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -418,7 +418,6 @@ steps: from_secret: gcp_key depends_on: - build-storybook - - end-to-end-tests - name: publish-frontend-metrics image: grafana/build-container:1.4.3 @@ -510,7 +509,6 @@ steps: GITHUB_PACKAGE_TOKEN: from_secret: github_package_token depends_on: - - end-to-end-tests - end-to-end-tests-server - name: upload-packages @@ -522,7 +520,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -845,16 +842,6 @@ steps: depends_on: - package -- name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3001 --tries 3 - environment: - HOST: end-to-end-tests-server - depends_on: - - end-to-end-tests-server - - name: build-storybook image: grafana/build-container:1.4.3 commands: @@ -948,7 +935,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -965,7 +951,6 @@ steps: from_secret: gcp_key depends_on: - build-storybook - - end-to-end-tests - name: release-npm-packages image: grafana/build-container:1.4.3 @@ -1249,16 +1234,6 @@ steps: depends_on: - package -- name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3001 --tries 3 - environment: - HOST: end-to-end-tests-server - depends_on: - - end-to-end-tests-server - - name: copy-packages-for-docker image: grafana/build-container:1.4.3 commands: @@ -1364,7 +1339,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -1411,16 +1385,6 @@ steps: depends_on: - package-enterprise2 -- name: end-to-end-tests-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3002 --tries 3 - environment: - HOST: end-to-end-tests-server-enterprise2 - depends_on: - - end-to-end-tests-server-enterprise2 - - name: upload-packages-enterprise2 image: grafana/grafana-ci-deploy:1.3.1 commands: @@ -1430,7 +1394,6 @@ steps: from_secret: gcp_key depends_on: - package-enterprise2 - - end-to-end-tests-enterprise2 - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -1794,16 +1757,6 @@ steps: depends_on: - package -- name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3001 --tries 3 - environment: - HOST: end-to-end-tests-server - depends_on: - - end-to-end-tests-server - - name: build-storybook image: grafana/build-container:1.4.3 commands: @@ -1891,7 +1844,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -1905,7 +1857,6 @@ steps: from_secret: gcp_key depends_on: - build-storybook - - end-to-end-tests - name: release-npm-packages image: grafana/build-container:1.4.3 @@ -2187,16 +2138,6 @@ steps: depends_on: - package -- name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3001 --tries 3 - environment: - HOST: end-to-end-tests-server - depends_on: - - end-to-end-tests-server - - name: copy-packages-for-docker image: grafana/build-container:1.4.3 commands: @@ -2296,7 +2237,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -2343,16 +2283,6 @@ steps: depends_on: - package-enterprise2 -- name: end-to-end-tests-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3002 --tries 3 - environment: - HOST: end-to-end-tests-server-enterprise2 - depends_on: - - end-to-end-tests-server-enterprise2 - - name: upload-packages-enterprise2 image: grafana/grafana-ci-deploy:1.3.1 commands: @@ -2362,7 +2292,6 @@ steps: from_secret: gcp_key depends_on: - package-enterprise2 - - end-to-end-tests-enterprise2 - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -2722,16 +2651,6 @@ steps: depends_on: - package -- name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3001 --tries 3 - environment: - HOST: end-to-end-tests-server - depends_on: - - end-to-end-tests-server - - name: build-storybook image: grafana/build-container:1.4.3 commands: @@ -2819,7 +2738,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -3083,16 +3001,6 @@ steps: depends_on: - package -- name: end-to-end-tests - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3001 --tries 3 - environment: - HOST: end-to-end-tests-server - depends_on: - - end-to-end-tests-server - - name: build-storybook image: grafana/build-container:1.4.3 commands: @@ -3202,7 +3110,6 @@ steps: from_secret: gcp_key depends_on: - package - - end-to-end-tests - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -3249,16 +3156,6 @@ steps: depends_on: - package-enterprise2 -- name: end-to-end-tests-enterprise2 - image: grafana/ci-e2e:12.19.0-1 - commands: - - ./node_modules/.bin/cypress install - - ./bin/grabpl e2e-tests --port 3002 --tries 3 - environment: - HOST: end-to-end-tests-server-enterprise2 - depends_on: - - end-to-end-tests-server-enterprise2 - - name: upload-packages-enterprise2 image: grafana/grafana-ci-deploy:1.3.1 commands: @@ -3268,7 +3165,6 @@ steps: from_secret: gcp_key depends_on: - package-enterprise2 - - end-to-end-tests-enterprise2 - end-to-end-tests-server - mysql-integration-tests - postgres-integration-tests @@ -3474,6 +3370,6 @@ get: --- kind: signature -hmac: 879a81aca1cb7a901b878e031ce0894fc756f97e4ca2ec89cde757b4878d0fd2 +hmac: b29b2b5d81bf443acb1f61caf900df9cba90b7e1a16fcc88aceeafcf7ad99895 ... diff --git a/scripts/lib.star b/scripts/lib.star index 9404e940c8f..2b650621e17 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -305,7 +305,6 @@ def publish_storybook_step(edition, ver_mode): 'image': publish_image, 'depends_on': [ 'build-storybook', - 'end-to-end-tests', ], 'environment': { 'GCP_KEY': from_secret('gcp_key'), @@ -808,7 +807,6 @@ def release_canary_npm_packages_step(edition): 'name': 'release-canary-npm-packages', 'image': build_image, 'depends_on': [ - 'end-to-end-tests', 'end-to-end-tests-server', ], 'environment': { @@ -858,7 +856,6 @@ def upload_packages_step(edition, ver_mode, is_downstream=False): dependencies = [ 'package' + enterprise2_sfx(edition), - 'end-to-end-tests' + enterprise2_sfx(edition), 'end-to-end-tests-server', 'mysql-integration-tests', 'postgres-integration-tests', diff --git a/scripts/release.star b/scripts/release.star index d5217b7fd4d..35322d64b95 100644 --- a/scripts/release.star +++ b/scripts/release.star @@ -97,7 +97,6 @@ def get_steps(edition, ver_mode): gen_version_step(ver_mode=ver_mode, include_enterprise2=include_enterprise2), package_step(edition=edition, ver_mode=ver_mode), e2e_tests_server_step(edition=edition), - e2e_tests_step(edition=edition, tries=3), build_storybook_step(edition=edition, ver_mode=ver_mode), copy_packages_for_docker_step(), build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=should_publish), @@ -125,7 +124,6 @@ def get_steps(edition, ver_mode): package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']), upload_cdn(edition=edition2), e2e_tests_server_step(edition=edition2, port=3002), - e2e_tests_step(edition=edition2, port=3002, tries=3), ]) if should_upload: steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))