From a101d127cbb27acbd126989017b3c68133b311f8 Mon Sep 17 00:00:00 2001
From: Joe Blubaugh <joe.blubaugh@grafana.com>
Date: Thu, 8 Sep 2022 15:03:02 +0800
Subject: [PATCH] CI: Update Drone MySQL version to 5.7.39 to match database
 policy. (#54612)

The supported database policy is listed at: https://grafana.com/docs/grafana/latest/setup-grafana/installation/#supported-databases
---
 .drone.yml                                         | 14 +++++++-------
 devenv/docker/blocks/mysql/.env                    |  2 +-
 devenv/docker/blocks/mysql_tests/.env              |  2 +-
 devenv/docker/blocks/mysql_tests/Dockerfile        |  2 +-
 .../ha-test-unified-alerting/docker-compose.yaml   |  2 +-
 devenv/docker/ha_test/docker-compose.yaml          |  2 +-
 scripts/drone/services/services.star               |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index dc55fe5253f..94458747507 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -501,7 +501,7 @@ services:
     MYSQL_PASSWORD: password
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
-  image: mysql:5.6.48
+  image: mysql:5.7.39
   name: mysql
   volumes:
   - name: mysql
@@ -1391,7 +1391,7 @@ services:
     MYSQL_PASSWORD: password
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
-  image: mysql:5.6.48
+  image: mysql:5.7.39
   name: mysql
   volumes:
   - name: mysql
@@ -2144,7 +2144,7 @@ services:
     MYSQL_PASSWORD: password
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
-  image: mysql:5.6.48
+  image: mysql:5.7.39
   name: mysql
   volumes:
   - name: mysql
@@ -2825,7 +2825,7 @@ services:
     MYSQL_PASSWORD: password
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
-  image: mysql:5.6.48
+  image: mysql:5.7.39
   name: mysql
   volumes:
   - name: mysql
@@ -4082,7 +4082,7 @@ services:
     MYSQL_PASSWORD: password
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
-  image: mysql:5.6.48
+  image: mysql:5.7.39
   name: mysql
   volumes:
   - name: mysql
@@ -4727,7 +4727,7 @@ services:
     MYSQL_PASSWORD: password
     MYSQL_ROOT_PASSWORD: rootpass
     MYSQL_USER: grafana
-  image: mysql:5.6.48
+  image: mysql:5.7.39
   name: mysql
   volumes:
   - name: mysql
@@ -5115,6 +5115,6 @@ kind: secret
 name: packages_secret_access_key
 ---
 kind: signature
-hmac: 8c812cebfce6e0c9aabaa4d85da9fda2f13eeedae60406a3a196c7488c4cdd6c
+hmac: 0b1eda9462f2da0c0991a3e774e2073b082924705ef8d97dd58a40a8c314d9cd
 
 ...
diff --git a/devenv/docker/blocks/mysql/.env b/devenv/docker/blocks/mysql/.env
index 94e03c2ab33..149162e38c2 100644
--- a/devenv/docker/blocks/mysql/.env
+++ b/devenv/docker/blocks/mysql/.env
@@ -1 +1 @@
-mysql_version=5.7
+mysql_version=5.7.39
diff --git a/devenv/docker/blocks/mysql_tests/.env b/devenv/docker/blocks/mysql_tests/.env
index 94e03c2ab33..149162e38c2 100644
--- a/devenv/docker/blocks/mysql_tests/.env
+++ b/devenv/docker/blocks/mysql_tests/.env
@@ -1 +1 @@
-mysql_version=5.7
+mysql_version=5.7.39
diff --git a/devenv/docker/blocks/mysql_tests/Dockerfile b/devenv/docker/blocks/mysql_tests/Dockerfile
index a9f4b0f3acd..bc7b499ecf0 100644
--- a/devenv/docker/blocks/mysql_tests/Dockerfile
+++ b/devenv/docker/blocks/mysql_tests/Dockerfile
@@ -1,4 +1,4 @@
-ARG mysql_version=5.7
+ARG mysql_version=5.7.39
 FROM mysql:${mysql_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/
diff --git a/devenv/docker/ha-test-unified-alerting/docker-compose.yaml b/devenv/docker/ha-test-unified-alerting/docker-compose.yaml
index 8fe5305674f..2424f1f0376 100644
--- a/devenv/docker/ha-test-unified-alerting/docker-compose.yaml
+++ b/devenv/docker/ha-test-unified-alerting/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "2.1"
 
 services:
   db:
-    image: mysql:5.6
+    image: mysql:5.7.39
     platform: linux/x86_64
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
diff --git a/devenv/docker/ha_test/docker-compose.yaml b/devenv/docker/ha_test/docker-compose.yaml
index 1875d49a240..52cbe8634c1 100644
--- a/devenv/docker/ha_test/docker-compose.yaml
+++ b/devenv/docker/ha_test/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
         tag: nginx
 
   db:
-    image: mysql:5.7
+    image: mysql:5.7.39
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
       MYSQL_DATABASE: grafana
diff --git a/scripts/drone/services/services.star b/scripts/drone/services/services.star
index 5170e15c060..e81d0550077 100644
--- a/scripts/drone/services/services.star
+++ b/scripts/drone/services/services.star
@@ -22,7 +22,7 @@ def integration_test_services(edition):
         },
         {
             'name': 'mysql',
-            'image': 'mysql:5.6.48',
+            'image': 'mysql:5.7.39',
             'environment': {
                 'MYSQL_ROOT_PASSWORD': 'rootpass',
                 'MYSQL_DATABASE': 'grafana_tests',