apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: update mariadb connection

Browse Source 
The new Alpine base that the Golang images are built on no longer trust the CA of MySQL.

This is a backport of: https://github.com/grafana/grafana/pull/98857
pull/99123/head
Mariell Hoversholm 5 months ago
parent 93c1d5a9f4
commit e1bb8ccb79
No known key found for this signature in database
2 changed files with 27 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 50
      .drone.yml
  2. 4
      scripts/drone/steps/lib.star

50
.drone.yml
Unescape View File

@ -1160,9 +1160,9 @@ steps:
name: wait-for-mysql-5.7 name: wait-for-mysql-5.7
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -1181,9 +1181,9 @@ steps:
name: wait-for-mysql-8.0 name: wait-for-mysql-8.0
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -2713,9 +2713,9 @@ steps:
name: wait-for-mysql-5.7 name: wait-for-mysql-5.7
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -2734,9 +2734,9 @@ steps:
name: wait-for-mysql-8.0 name: wait-for-mysql-8.0
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -3297,9 +3297,9 @@ steps:
name: wait-for-mysql-5.7 name: wait-for-mysql-5.7
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -3318,9 +3318,9 @@ steps:
name: wait-for-mysql-8.0 name: wait-for-mysql-8.0
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -5041,9 +5041,9 @@ steps:
name: wait-for-mysql-5.7 name: wait-for-mysql-5.7
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -5062,9 +5062,9 @@ steps:
name: wait-for-mysql-8.0 name: wait-for-mysql-8.0
- commands: - commands:
- apk add --update build-base - apk add --update build-base
- apk add --update mysql-client - apk add --update mariadb-client
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root - cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
-prootpass root -prootpass --disable-ssl-verify-server-cert
- go clean -testcache - go clean -testcache
- go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find - go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find
./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+'
@ -5739,6 +5739,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: f58217f51a17b707d2f40740303c3c736116a22d822379bb147fe1849e099ba4 hmac: be19150e8d9c93d3e71e570e9e8c6a13310bbde351260ccc73f7b2c515f8d511
... ...

4
scripts/drone/steps/lib.star
Unescape View File

@ -1075,8 +1075,8 @@ def postgres_integration_tests_steps():
def mysql_integration_tests_steps(hostname, version): def mysql_integration_tests_steps(hostname, version):
cmds = [ cmds = [
"apk add --update mysql-client", "apk add --update mariadb-client", # alpine doesn't package mysql anymore; more info: https://wiki.alpinelinux.org/wiki/MySQL
"cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h {} -P 3306 -u root -prootpass".format(hostname), "cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h {} -P 3306 -u root -prootpass --disable-ssl-verify-server-cert".format(hostname),
"go clean -testcache", "go clean -testcache",
"go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\\(.*\\)/' | sort -u)", "go test -p=1 -count=1 -covermode=atomic -timeout=5m -run '^TestIntegration' $(find ./pkg -type f -name '*_test.go' -exec grep -l '^func TestIntegration' '{}' '+' | grep -o '\\(.*\\)/' | sort -u)",
] ]

Write Preview
Loading…
Cancel
Save