Storage: Removes integration tests for MySQL 5.7 since it is EOL (#98013)

* Removes integration tests for MySQL 5.7 since it is EOL Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com> * Remake drone.yml Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com> --------- Signed-off-by: Bruno Abrantes <bruno@brunoabrantes.com>
2025-02-25 18:55:37 -06:00 · 2024-12-16 16:28:30 +01:00
parent 2879166426
commit 17a9974b87
6 changed files with 1 additions and 193 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -1021,18 +1021,6 @@ services:
  volumes:
  - name: postgres
    path: /var/lib/postgresql/data/pgdata
- commands:
-  - docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-  image: mysql:5.7.39
-  name: mysql57
-  volumes:
-  - name: mysql57
-    path: /var/lib/mysql
 - commands:
  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
  environment:
@@ -1161,27 +1149,6 @@ steps:
    POSTGRES_HOST: postgres
  image: golang:1.23.1-alpine
  name: postgres-integration-tests
- commands:
-  - dockerize -wait tcp://mysql57:3306 -timeout 120s
-  image: jwilder/dockerize:0.6.1
-  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
-  - 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)
-  depends_on:
-  - wire-install
-  - wait-for-mysql-5.7
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql57
-  image: golang:1.23.1-alpine
-  name: mysql-5.7-integration-tests
 - commands:
  - dockerize -wait tcp://mysql80:3306 -timeout 120s
  image: jwilder/dockerize:0.6.1
@@ -1274,9 +1241,6 @@ volumes:
 - name: postgres
  temp:
    medium: memory
- name: mysql57
-  temp:
-    medium: memory
 - name: mysql80
  temp:
    medium: memory
@@ -1499,18 +1463,6 @@ services:
  volumes:
  - name: postgres
    path: /var/lib/postgresql/data/pgdata
- commands:
-  - docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-  image: mysql:5.7.39
-  name: mysql57
-  volumes:
-  - name: mysql57
-    path: /var/lib/mysql
 - commands:
  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
  environment:
@@ -1627,17 +1579,6 @@ steps:
    POSTGRES_HOST: postgres
  image: golang:1.23.1-alpine
  name: postgres-benchmark-integration-tests
- commands:
-  - apk add --update build-base
-  - if [ -z ${GO_PACKAGES} ]; then echo 'missing GO_PACKAGES'; false; fi
-  - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
-  depends_on:
-  - wire-install
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql57
-  image: golang:1.23.1-alpine
-  name: mysql-5.7-benchmark-integration-tests
 - commands:
  - apk add --update build-base
  - if [ -z ${GO_PACKAGES} ]; then echo 'missing GO_PACKAGES'; false; fi
@@ -1662,9 +1603,6 @@ volumes:
 - name: postgres
  temp:
    medium: memory
- name: mysql57
-  temp:
-    medium: memory
 - name: mysql80
  temp:
    medium: memory
@@ -2617,18 +2555,6 @@ services:
  volumes:
  - name: postgres
    path: /var/lib/postgresql/data/pgdata
- commands:
-  - docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-  image: mysql:5.7.39
-  name: mysql57
-  volumes:
-  - name: mysql57
-    path: /var/lib/mysql
 - commands:
  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
  environment:
@@ -2718,27 +2644,6 @@ steps:
    POSTGRES_HOST: postgres
  image: golang:1.23.1-alpine
  name: postgres-integration-tests
- commands:
-  - dockerize -wait tcp://mysql57:3306 -timeout 120s
-  image: jwilder/dockerize:0.6.1
-  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
-  - 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)
-  depends_on:
-  - wire-install
-  - wait-for-mysql-5.7
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql57
-  image: golang:1.23.1-alpine
-  name: mysql-5.7-integration-tests
 - commands:
  - dockerize -wait tcp://mysql80:3306 -timeout 120s
  image: jwilder/dockerize:0.6.1
@@ -2827,9 +2732,6 @@ volumes:
 - name: postgres
  temp:
    medium: memory
- name: mysql57
-  temp:
-    medium: memory
 - name: mysql80
  temp:
    medium: memory
@@ -3201,18 +3103,6 @@ services:
  volumes:
  - name: postgres
    path: /var/lib/postgresql/data/pgdata
- commands:
-  - docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-  image: mysql:5.7.39
-  name: mysql57
-  volumes:
-  - name: mysql57
-    path: /var/lib/mysql
 - commands:
  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
  environment:
@@ -3302,27 +3192,6 @@ steps:
    POSTGRES_HOST: postgres
  image: golang:1.23.1-alpine
  name: postgres-integration-tests
- commands:
-  - dockerize -wait tcp://mysql57:3306 -timeout 120s
-  image: jwilder/dockerize:0.6.1
-  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
-  - 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)
-  depends_on:
-  - wire-install
-  - wait-for-mysql-5.7
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql57
-  image: golang:1.23.1-alpine
-  name: mysql-5.7-integration-tests
 - commands:
  - dockerize -wait tcp://mysql80:3306 -timeout 120s
  image: jwilder/dockerize:0.6.1
@@ -3409,9 +3278,6 @@ volumes:
 - name: postgres
  temp:
    medium: memory
- name: mysql57
-  temp:
-    medium: memory
 - name: mysql80
  temp:
    medium: memory
@@ -4954,18 +4820,6 @@ services:
  volumes:
  - name: postgres
    path: /var/lib/postgresql/data/pgdata
- commands:
-  - docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-  environment:
-    MYSQL_DATABASE: grafana_tests
-    MYSQL_PASSWORD: password
-    MYSQL_ROOT_PASSWORD: rootpass
-    MYSQL_USER: grafana
-  image: mysql:5.7.39
-  name: mysql57
-  volumes:
-  - name: mysql57
-    path: /var/lib/mysql
 - commands:
  - docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password
  environment:
@@ -5048,27 +4902,6 @@ steps:
    POSTGRES_HOST: postgres
  image: golang:1.23.1-alpine
  name: postgres-integration-tests
- commands:
-  - dockerize -wait tcp://mysql57:3306 -timeout 120s
-  image: jwilder/dockerize:0.6.1
-  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
-  - 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)
-  depends_on:
-  - wire-install
-  - wait-for-mysql-5.7
-  environment:
-    GRAFANA_TEST_DB: mysql
-    MYSQL_HOST: mysql57
-  image: golang:1.23.1-alpine
-  name: mysql-5.7-integration-tests
 - commands:
  - dockerize -wait tcp://mysql80:3306 -timeout 120s
  image: jwilder/dockerize:0.6.1
@@ -5150,9 +4983,6 @@ volumes:
 - name: postgres
  temp:
    medium: memory
- name: mysql57
-  temp:
-    medium: memory
 - name: mysql80
  temp:
    medium: memory
@@ -5454,7 +5284,6 @@ steps:
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM python:3.8
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/mimir-alpine:r316-55f47f8
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:8.0.32
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM redis:6.2.11-alpine
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM memcached:1.6.9-alpine
@@ -5493,7 +5322,6 @@ steps:
  - trivy --exit-code 1 --severity HIGH,CRITICAL python:3.8
  - trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine
  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/mimir-alpine:r316-55f47f8
-  - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39
  - trivy --exit-code 1 --severity HIGH,CRITICAL mysql:8.0.32
  - trivy --exit-code 1 --severity HIGH,CRITICAL redis:6.2.11-alpine
  - trivy --exit-code 1 --severity HIGH,CRITICAL memcached:1.6.9-alpine
@@ -5751,6 +5579,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 08edb24b8ec53e0ce09f525cf6fdf4ea5dc67710fe64c3ea93ceaf3af42b8305
+hmac: 341dbe9d2f9c6d2ee70026e495921ea4670550729350047ec0c680094497cc44

 ...
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -273,7 +273,6 @@ def integration_test_pipelines():
    pipelines = []
    volumes = integration_test_services_volumes()
    integration_test_steps = postgres_integration_tests_steps() + \
-                             mysql_integration_tests_steps("mysql57", "5.7") + \
                             mysql_integration_tests_steps("mysql80", "8.0") + \
                             redis_integration_tests_steps() + \
                             memcached_integration_tests_steps() + \
--- a/scripts/drone/pipelines/benchmarks.star
+++ b/scripts/drone/pipelines/benchmarks.star
@@ -66,10 +66,6 @@ def integration_benchmarks(prefix):
                          "GRAFANA_TEST_DB": "postgres",
                          "POSTGRES_HOST": "postgres",
                      }) + \
-                      integration_benchmarks_step("mysql-5.7", {
-                          "GRAFANA_TEST_DB": "mysql",
-                          "MYSQL_HOST": "mysql57",
-                      }) + \
                      integration_benchmarks_step("mysql-8.0", {
                          "GRAFANA_TEST_DB": "mysql",
                          "MYSQL_HOST": "mysql80",
--- a/scripts/drone/pipelines/integration_tests.star
+++ b/scripts/drone/pipelines/integration_tests.star
@@ -71,7 +71,6 @@ def integration_tests(trigger, prefix, ver_mode = "pr"):

    # test_steps = [a, b] + [c, d] + [e, f]...
    test_steps = postgres_integration_tests_steps() + \
-                 mysql_integration_tests_steps("mysql57", "5.7") + \
                 mysql_integration_tests_steps("mysql80", "8.0") + \
                 redis_integration_tests_steps() + \
                 memcached_integration_tests_steps() + \
--- a/scripts/drone/services/services.star
+++ b/scripts/drone/services/services.star
@@ -10,7 +10,6 @@ load(
 def integration_test_services_volumes():
    return [
        {"name": "postgres", "temp": {"medium": "memory"}},
-        {"name": "mysql57", "temp": {"medium": "memory"}},
        {"name": "mysql80", "temp": {"medium": "memory"}},
    ]

@@ -29,18 +28,6 @@ def integration_test_services():
                {"name": "postgres", "path": "/var/lib/postgresql/data/pgdata"},
            ],
        },
-        {
-            "name": "mysql57",
-            "image": images["mysql5"],
-            "environment": {
-                "MYSQL_ROOT_PASSWORD": "rootpass",
-                "MYSQL_DATABASE": "grafana_tests",
-                "MYSQL_USER": "grafana",
-                "MYSQL_PASSWORD": "password",
-            },
-            "volumes": [{"name": "mysql57", "path": "/var/lib/mysql"}],
-            "commands": ["docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci"],
-        },
        {
            "name": "mysql80",
            "image": images["mysql8"],
--- a/scripts/drone/utils/images.star
+++ b/scripts/drone/utils/images.star
@@ -23,7 +23,6 @@ images = {
    "python": "python:3.8",
    "postgres_alpine": "postgres:12.3-alpine",
    "mimir": "grafana/mimir-alpine:r316-55f47f8",
-    "mysql5": "mysql:5.7.39",
    "mysql8": "mysql:8.0.32",
    "redis_alpine": "redis:6.2.11-alpine",
    "memcached_alpine": "memcached:1.6.9-alpine",