From e03b8d6d377e7441049e461050d0a51b508bf51e Mon Sep 17 00:00:00 2001 From: Horst Gutmann Date: Wed, 10 May 2023 14:16:31 +0200 Subject: [PATCH] [v9.3.x] CI: Remove windows backend tests from release pipelines (#68166) (#68204) Remove windows backend tests from release pipelines These are run in other places so there is no benefit to also include them here. (cherry picked from commit 1e8cad625bcecc48ae8bc6eeb0284633fde9be10) Backport of https://github.com/grafana/grafana/pull/68166 --- .drone.yml | 123 +----------------------------- scripts/drone/events/release.star | 33 ++++---- 2 files changed, 18 insertions(+), 138 deletions(-) diff --git a/.drone.yml b/.drone.yml index a9601db445d..65f790af4ae 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2683,132 +2683,11 @@ volumes: path: /var/run/docker.sock name: docker --- -clone: - retries: 3 -depends_on: [] -environment: - EDITION: oss -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: release-oss-test-backend-windows -platform: - arch: amd64 - os: windows - version: "1809" -services: [] -steps: -- commands: [] - image: grafana/grafana-ci-windows-test:0.1.0 - name: windows-init -- commands: - - go install github.com/google/wire/cmd/wire@v0.5.0 - - wire gen -tags oss ./pkg/server - depends_on: - - windows-init - image: grafana/grafana-ci-windows-test:0.1.0 - name: wire-install -- commands: - - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... - depends_on: - - wire-install - failure: ignore - image: grafana/grafana-ci-windows-test:0.1.0 - name: test-backend -trigger: - event: - exclude: - - promote - ref: - exclude: - - refs/tags/*-cloud* - include: - - refs/tags/v* -type: docker -volumes: -- host: - path: //./pipe/docker_engine/ - name: docker ---- -clone: - disable: true -depends_on: [] -environment: - EDITION: enterprise -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: release-enterprise-test-backend-windows -platform: - arch: amd64 - os: windows - version: "1809" -services: [] -steps: -- commands: - - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/windows/grabpl.exe - -OutFile grabpl.exe - image: grafana/ci-wix:0.1.1 - name: grabpl -- commands: - - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - - cd grafana-enterprise - - git checkout ${DRONE_TAG} - environment: - GITHUB_TOKEN: - from_secret: github_token - image: grafana/ci-wix:0.1.1 - name: clone -- commands: - - cp -r grafana-enterprise C:\App\grafana-enterprise - - rm -r -force grafana-enterprise - - cp grabpl.exe C:\App\grabpl.exe - - rm -force grabpl.exe - - C:\App\grabpl.exe init-enterprise --github-token $$env:GITHUB_TOKEN C:\App\grafana-enterprise - - cp C:\App\grabpl.exe grabpl.exe - depends_on: - - clone - environment: - GITHUB_TOKEN: - from_secret: github_token - image: grafana/ci-wix:0.1.1 - name: windows-init -- commands: - - go install github.com/google/wire/cmd/wire@v0.5.0 - - wire gen -tags enterprise ./pkg/server - depends_on: - - windows-init - image: grafana/grafana-ci-windows-test:0.1.0 - name: wire-install -- commands: - - go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/... - depends_on: - - wire-install - failure: ignore - image: grafana/grafana-ci-windows-test:0.1.0 - name: test-backend -trigger: - event: - exclude: - - promote - ref: - exclude: - - refs/tags/*-cloud* - include: - - refs/tags/v* -type: docker -volumes: -- host: - path: //./pipe/docker_engine/ - name: docker ---- clone: retries: 3 depends_on: - release-oss-build-e2e-publish - release-oss-test-frontend -- release-oss-test-backend-windows environment: EDITION: oss image_pull_secrets: @@ -6884,6 +6763,6 @@ kind: secret name: enterprise2_security_prefix --- kind: signature -hmac: 21da7b583ab554ed5d9969ed8258523535f55b576bbf73a7f174e79afebac762 +hmac: c82042d35770caed3b56d264f9f40b41f4dbe04e9e9e1b8d89e3baead0c21bee ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 2900d204088..e9211158631 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -215,20 +215,10 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger): integration_test_steps = [] volumes = [] - windows_pipeline = pipeline( - name = "{}-oss-windows".format(ver_mode), - edition = "oss", - trigger = trigger, - steps = get_windows_steps(edition = "oss", ver_mode = ver_mode), - platform = "windows", - depends_on = [ - "{}-oss-build-e2e-publish".format(ver_mode), - "{}-oss-test-frontend".format(ver_mode), - "{}-oss-test-backend-windows".format(ver_mode), - ], - environment = environment, - ) - + windows_pipeline_dependencies = [ + "{}-oss-build-e2e-publish".format(ver_mode), + "{}-oss-test-frontend".format(ver_mode), + ] pipelines = [ pipeline( name = "{}-oss-build-e2e-publish".format(ver_mode), @@ -241,11 +231,12 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger): ), test_frontend(trigger, ver_mode), test_backend(trigger, ver_mode), - windows_test_backend(trigger, "oss", ver_mode), - windows_test_backend(trigger, "enterprise", ver_mode), ] if ver_mode not in ("release"): + pipelines.append(windows_test_backend(trigger, "oss", ver_mode)) + pipelines.append(windows_test_backend(trigger, "enterprise", ver_mode)) + windows_pipeline_dependencies.append("{}-oss-test-backend-windows".format(ver_mode)) pipelines.append(pipeline( name = "{}-oss-integration-tests".format(ver_mode), edition = "oss", @@ -263,6 +254,16 @@ def oss_pipelines(ver_mode = ver_mode, trigger = release_trigger): volumes = volumes, )) + windows_pipeline = pipeline( + name = "{}-oss-windows".format(ver_mode), + edition = "oss", + trigger = trigger, + steps = get_windows_steps(edition = "oss", ver_mode = ver_mode), + platform = "windows", + depends_on = windows_pipeline_dependencies, + environment = environment, + ) + pipelines.append(windows_pipeline) return pipelines