chore: replace sqlsrv docker image

Leiyks · Leiyks · commit 1e0ed444429e · 2026-02-11T01:17:59.000+01:00
Signed-off-by: Alexandre Rulleau &lt;alexandre.rulleau@datadoghq.com&gt;
diff --git a/.gitlab/check_sqlsrv.sh b/.gitlab/check_sqlsrv.sh
diff --git a/.gitlab/generate-common.php b/.gitlab/generate-common.php
@@ -206,15 +206,6 @@ function dockerhub_login() {
       ACCEPT_EULA: Y
       MSSQL_SA_PASSWORD: Password12!
       MSSQL_PID: Developer
-      MSSQL_TCP_PORT: 1433
-      MSSQL_AGENT_ENABLED: "false"
-      MSSQL_MEMORY_LIMIT_MB: 2048
-      MSSQL_ENABLE_HADR: 0
-      MSSQL_LCID: 1033
-      MSSQL_COLLATION: SQL_Latin1_General_CP1_CI_AS
-      MSSQL_DATA_DIR: /var/opt/mssql/data
-      MSSQL_LOG_DIR: /var/opt/mssql/log
-      MSSQL_BACKUP_DIR: /var/opt/mssql/data
 
   googlespanner:
     name: registry.ddbuild.io/images/mirror/cloud-spanner-emulator/emulator:1.5.25
diff --git a/.gitlab/generate-tracer.php b/.gitlab/generate-tracer.php
@@ -22,10 +22,6 @@ function after_script($execute_dir = ".", $has_test_agent = false) {
 <?php if ($has_test_agent): ?>
     - .gitlab/check_test_agent.sh
 <?php endif; ?>
-    - |
-      if [[ "${MAKE_TARGET:-}" == *"sqlsrv"* ]]; then
-        .gitlab/check_sqlsrv.sh
-      fi
     - .gitlab/collect_artifacts.sh "<?= $execute_dir ?>"
     - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src"
 <?php
diff --git a/tests/Integrations/SQLSRV/SQLSRVTest.php b/tests/Integrations/SQLSRV/SQLSRVTest.php
@@ -39,8 +39,7 @@ public static function ddSetUpBeforeClass()
 
     private static function waitForSqlServerReady()
     {
-        // SQL Server 2022 containers can take up to 2 minutes to fully initialize
-        $maxAttempts = 120;
+        $maxAttempts = 30;
         $attempt = 0;
         $conn = false;
 
@@ -53,13 +52,12 @@ private static function waitForSqlServerReady()
                     'Database' => self::$db,
                     'UID' => self::$user,
                     'TrustServerCertificate' => true,
-                    'LoginTimeout' => 1,
                 ]
             );
 
             if ($conn === false) {
                 if ($attempt < $maxAttempts) {
-                    usleep(1000000); // 1 second between attempts
+                    usleep(500000);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ public static function ddSetUpBeforeClass()`
`39`	`39`
`40`	`40`	`private static function waitForSqlServerReady()`
`41`	`41`	`{`
`42`		`- // SQL Server 2022 containers can take up to 2 minutes to fully initialize`
`43`		`- $maxAttempts = 120;`
	`42`	`+ $maxAttempts = 30;`
`44`	`43`	`$attempt = 0;`
`45`	`44`	`$conn = false;`
`46`	`45`
`@@ -53,13 +52,12 @@ private static function waitForSqlServerReady()`
`53`	`52`	`'Database' => self::$db,`
`54`	`53`	`'UID' => self::$user,`
`55`	`54`	`'TrustServerCertificate' => true,`
`56`		`- 'LoginTimeout' => 1,`
`57`	`55`	`]`
`58`	`56`	`);`
`59`	`57`
`60`	`58`	`if ($conn === false) {`
`61`	`59`	`if ($attempt < $maxAttempts) {`
`62`		`- usleep(1000000); // 1 second between attempts`
	`60`	`+ usleep(500000);`
`63`	`61`	`}`
`64`	`62`	`}`
`65`	`63`	`}`