feat: updating the mysql version used in the tests

DIRACGrid · Feb 10, 2025 · 1325d54 · 1325d54
1 parent 554b37c
commit 1325d54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -31,8 +31,8 @@ jobs:
       matrix:
         # TEST_NAME is a dummy variable used to make it easier to read the web interface
         include:
-          - TEST_NAME: "MySQL 5.7"
-            ARGS: MYSQL_VER=mysql:5.7
+          - TEST_NAME: "MySQL 8.0"
+            ARGS: MYSQL_VER=mysql:8.0.40
           - TEST_NAME: "MariaDB 10.6, opensearch:2.1.0"
             ARGS: MYSQL_VER=mariadb:10.6.3 ES_VER=opensearchproject/opensearch:2.1.0
           - TEST_NAME: "HTTPS"

diff --git a/integration_tests.py b/integration_tests.py
@@ -22,7 +22,7 @@
 
 # Editable configuration
 DEFAULT_HOST_OS = "cc7"
-DEFAULT_MYSQL_VER = "mysql:8.0"
+DEFAULT_MYSQL_VER = "mysql:8.4.4"
 DEFAULT_ES_VER = "elasticsearch:7.9.1"
 DEFAULT_IAM_VER = "indigoiam/iam-login-service:v1.10.2"
 

diff --git a/src/DIRAC/StorageManagementSystem/DB/StorageManagementDB.sql b/src/DIRAC/StorageManagementSystem/DB/StorageManagementDB.sql
@@ -23,7 +23,7 @@ CREATE TABLE Tasks(
   `CompleteTime` DATETIME,
   `CallBackMethod` VARCHAR(255),
   `SourceTaskID` VARCHAR(32),
-  PRIMARY KEY(`TaskID`,`Status`),
+  PRIMARY KEY(`TaskID`),
   INDEX(`TaskID`,`Status`)
 )ENGINE=INNODB;
 
@@ -41,7 +41,7 @@ CREATE TABLE CacheReplicas(
   `LastUpdate` DATETIME,
   `Reason` VARCHAR(255),
   `Links` INTEGER DEFAULT 0,
-  PRIMARY KEY (`ReplicaID`,`LFN`,`SE`),
+  PRIMARY KEY (`ReplicaID`),
   INDEX(`ReplicaID`,`Status`,`SE`)
 )ENGINE=INNODB;