IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Revert drone go workspace change to tests (#91762)

Browse Source
This commit is contained in:
Todd Treece 2024-08-09 14:03:26 -04:00 committed by GitHub
parent 24c9aad5bb
commit 30c3f5b66a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.drone.yml
View File

@ -397,8 +397,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- ./scripts/go-workspace/test-includes.sh | xargs go test -tags requires_buildifier - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
-short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.22.4-alpine image: golang:1.22.4-alpine
@ -1098,8 +1097,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationRedis - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-redis - wait-for-redis
@ -1114,8 +1113,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationMemcached - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-memcached - wait-for-memcached
@ -1776,8 +1775,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- ./scripts/go-workspace/test-includes.sh | xargs go test -tags requires_buildifier - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
-short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.22.4-alpine image: golang:1.22.4-alpine
@ -2604,8 +2602,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationRedis - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-redis - wait-for-redis
@ -2620,8 +2618,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationMemcached - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-memcached - wait-for-memcached
@ -2974,8 +2972,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- ./scripts/go-workspace/test-includes.sh | xargs go test -tags requires_buildifier - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
-short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.22.4-alpine image: golang:1.22.4-alpine
@ -3237,8 +3234,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationRedis - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-redis - wait-for-redis
@ -3253,8 +3250,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationMemcached - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-memcached - wait-for-memcached
@ -4360,8 +4357,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- ./scripts/go-workspace/test-includes.sh | xargs go test -tags requires_buildifier - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
-short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.22.4-alpine image: golang:1.22.4-alpine
@ -4782,8 +4778,7 @@ steps:
name: wire-install name: wire-install
- commands: - commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang - apk add --update build-base shared-mime-info shared-mime-info-lang
- ./scripts/go-workspace/test-includes.sh | xargs go test -tags requires_buildifier - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m
-short -covermode=atomic -timeout=5m
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.22.4-alpine image: golang:1.22.4-alpine
@ -5207,7 +5202,7 @@ steps:
image: golang:1.22.4-windowsservercore-1809 image: golang:1.22.4-windowsservercore-1809
name: wire-install name: wire-install
- commands: - commands:
- go test -tags requires_buildifier -short -covermode=atomic -timeout=5m ./pkg/... - go test -short -covermode=atomic -timeout=5m ./pkg/...
depends_on: depends_on:
- wire-install - wire-install
image: golang:1.22.4-windowsservercore-1809 image: golang:1.22.4-windowsservercore-1809
@ -5391,8 +5386,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationRedis - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-redis - wait-for-redis
@ -5407,8 +5402,8 @@ steps:
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- go clean -testcache - go clean -testcache
- ./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationMemcached - go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic
-covermode=atomic -timeout=2m -timeout=2m
depends_on: depends_on:
- wire-install - wire-install
- wait-for-memcached - wait-for-memcached
@ -6079,6 +6074,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 6f24dc66b5c71dacfcd1a7bd8e42341a0f564e718605ccea252a2d68ff4b7918 hmac: d35eadf9a166f68973ffd6df85f165bbda468d422d5debe416ec6a5af6ead84a
... ...

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

@ -553,7 +553,7 @@ def test_backend_step():
# shared-mime-info and shared-mime-info-lang is used for exactly 1 test for the # shared-mime-info and shared-mime-info-lang is used for exactly 1 test for the
# mime.TypeByExtension function. # mime.TypeByExtension function.
"apk add --update build-base shared-mime-info shared-mime-info-lang", "apk add --update build-base shared-mime-info shared-mime-info-lang",
"./scripts/go-workspace/test-includes.sh | xargs go test -tags requires_buildifier -short -covermode=atomic -timeout=5m", "go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m",
], ],
} }
@ -1056,7 +1056,7 @@ def mysql_integration_tests_steps(hostname, version):
def redis_integration_tests_steps(): def redis_integration_tests_steps():
cmds = [ cmds = [
"go clean -testcache", "go clean -testcache",
"./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationRedis -covermode=atomic -timeout=2m", "go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationRedis -covermode=atomic -timeout=2m",
] ]
environment = { environment = {
@ -1081,7 +1081,7 @@ def remote_alertmanager_integration_tests_steps():
def memcached_integration_tests_steps(): def memcached_integration_tests_steps():
cmds = [ cmds = [
"go clean -testcache", "go clean -testcache",
"./scripts/go-workspace/test-includes.sh | xargs go test -run IntegrationMemcached -covermode=atomic -timeout=2m", "go list -f '{{.Dir}}/...' -m | xargs go test -run IntegrationMemcached -covermode=atomic -timeout=2m",
] ]
environment = { environment = {

2
scripts/drone/steps/lib_windows.star
View File

@ -156,7 +156,7 @@ def test_backend_step_windows():
"wire-install", "wire-install",
], ],
"commands": [ "commands": [
"go test -tags requires_buildifier -short -covermode=atomic -timeout=5m ./pkg/...", "go test -short -covermode=atomic -timeout=5m ./pkg/...",
], ],
} }