build: update mariadb connection
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
This commit is contained in:
+25
-25
@@ -1160,9 +1160,9 @@ steps:
|
||||
name: wait-for-mysql-5.7
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -1181,9 +1181,9 @@ steps:
|
||||
name: wait-for-mysql-8.0
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -2713,9 +2713,9 @@ steps:
|
||||
name: wait-for-mysql-5.7
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -2734,9 +2734,9 @@ steps:
|
||||
name: wait-for-mysql-8.0
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -3297,9 +3297,9 @@ steps:
|
||||
name: wait-for-mysql-5.7
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -3318,9 +3318,9 @@ steps:
|
||||
name: wait-for-mysql-8.0
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -5041,9 +5041,9 @@ steps:
|
||||
name: wait-for-mysql-5.7
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql57 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql57 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -5062,9 +5062,9 @@ steps:
|
||||
name: wait-for-mysql-8.0
|
||||
- commands:
|
||||
- apk add --update build-base
|
||||
- apk add --update mysql-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h mysql80 -P 3306 -u root
|
||||
-prootpass
|
||||
- apk add --update mariadb-client
|
||||
- cat devenv/docker/blocks/mysql_tests/setup.sql | mariadb -h mysql80 -P 3306 -u
|
||||
root -prootpass --disable-ssl-verify-server-cert
|
||||
- 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' '{}' '+'
|
||||
@@ -5739,6 +5739,6 @@ kind: secret
|
||||
name: gcr_credentials
|
||||
---
|
||||
kind: signature
|
||||
hmac: f58217f51a17b707d2f40740303c3c736116a22d822379bb147fe1849e099ba4
|
||||
hmac: be19150e8d9c93d3e71e570e9e8c6a13310bbde351260ccc73f7b2c515f8d511
|
||||
|
||||
...
|
||||
|
||||
@@ -1075,8 +1075,8 @@ def postgres_integration_tests_steps():
|
||||
|
||||
def mysql_integration_tests_steps(hostname, version):
|
||||
cmds = [
|
||||
"apk add --update mysql-client",
|
||||
"cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h {} -P 3306 -u root -prootpass".format(hostname),
|
||||
"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 | mariadb -h {} -P 3306 -u root -prootpass --disable-ssl-verify-server-cert".format(hostname),
|
||||
"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)",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user