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
(cherry picked from commit e1bb8ccb79)
This commit is contained in:
+25
-25
@@ -1163,9 +1163,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' '{}' '+'
|
||||
@@ -1184,9 +1184,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' '{}' '+'
|
||||
@@ -2722,9 +2722,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' '{}' '+'
|
||||
@@ -2743,9 +2743,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' '{}' '+'
|
||||
@@ -3306,9 +3306,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' '{}' '+'
|
||||
@@ -3327,9 +3327,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' '{}' '+'
|
||||
@@ -5007,9 +5007,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' '{}' '+'
|
||||
@@ -5028,9 +5028,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' '{}' '+'
|
||||
@@ -5705,6 +5705,6 @@ kind: secret
|
||||
name: gcr_credentials
|
||||
---
|
||||
kind: signature
|
||||
hmac: ce64283d0b8f86c0dc8a10ce78dc9a9203718adb75e1e294d6093bf2c1127dfc
|
||||
hmac: a63863f55ce7646ca090c519b4ba3c4ff8103b071097f827eafb7bad1aafcaac
|
||||
|
||||
...
|
||||
|
||||
@@ -1052,8 +1052,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