Merge pull request #8044 from fstagni/cherry-pick-2-50d498d76-integra…

…tion [sweep:integration] updating the mysql version used in the tests
DIRACGrid · Feb 12, 2025 · 204757e · 204757e
2 parents a5e5605 + 585209c
commit 204757e
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
@@ -33,8 +33,8 @@ jobs:
         include:
           - TEST_NAME: "MariaDB 11.4"
             ARGS: MYSQL_VER=mariadb:11.4.3
-          - TEST_NAME: "HTTPS"
-            ARGS: TEST_HTTPS=Yes
+          - TEST_NAME: "HTTPS and MySQL8"
+            ARGS: TEST_HTTPS=Yes MYSQL_VER=mysql:8.0.40
           - TEST_NAME: "Force DEncode"
             ARGS: DIRAC_USE_JSON_ENCODE=NO
           - TEST_NAME: "Backward Compatibility"

diff --git a/integration_tests.py b/integration_tests.py
@@ -23,7 +23,7 @@
 
 # Editable configuration
 DEFAULT_HOST_OS = "el9"
-DEFAULT_MYSQL_VER = "mysql:8.0.40"
+DEFAULT_MYSQL_VER = "mysql:8.4.4"
 DEFAULT_ES_VER = "opensearchproject/opensearch:2.18.0"
 DEFAULT_IAM_VER = "indigoiam/iam-login-service:v1.10.2"
 FEATURE_VARIABLES = {

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;