[misc] remove use of srv environment test in CI

Author: rusher

.github/workflows/ci.yml

@@ -74,6 +74,7 @@ jobs:
           LOCAL_DB: ${{ steps.setup-env.outputs.database-type }}
           DB_TYPE: ${{ matrix.db-type }}
           TEST_DB_SERVER_CERT: ${{ matrix.db-type == 'container' && './.github/workflows/certs/server.crt' || '' }}
+          DB_VERSION: ${{ matrix.db-tag }}
 
       - name: Download Codecov uploader
         shell: bash

test/base.js

@@ -48,7 +48,7 @@ module.exports.isMaxscale = function isMaxscale() {
     const maxscaleVersion = global.shareConn.info.maxscaleVersion;
     if (!maxscaleVersion) {
       // maxscale before 23.08
-      return process.env.srv === 'maxscale';
+      return process.env.DB_TYPE === 'maxscale' || process.env.srv === 'maxscale';
     }
   }
   return true;

test/integration/datatype/test-datetime.js

@@ -1,5 +1,5 @@
 //  SPDX-License-Identifier: LGPL-2.1-or-later
-//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+//  Copyright (c) 2015-2025 MariaDB Corporation Ab
 
 'use strict';
 
@@ -47,11 +47,7 @@ describe('datetime', () => {
     //using distant server, time might be different
     // if local socket not available, this means using distant / docker server that might have other default
     if (!process.env.LOCAL_SOCKET_AVAILABLE) this.skip();
-    if (
-      (Conf.baseConfig.host !== 'localhost' && Conf.baseConfig.host !== 'mariadb.example.com') ||
-      isMaxscale() ||
-      process.env.srv === 'skysql-ha'
-    )
+    if ((Conf.baseConfig.host !== 'localhost' && Conf.baseConfig.host !== 'mariadb.example.com') || isMaxscale())
       this.skip();
 
     let res = await shareConn.query('SELECT UNIX_TIMESTAMP(?) tt', [new Date('2000-01-01 UTC')]);

test/integration/test-additional-server-info.js

@@ -1,5 +1,5 @@
 //  SPDX-License-Identifier: LGPL-2.1-or-later
-//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+//  Copyright (c) 2015-2025 MariaDB Corporation Ab
 
 'use strict';
 
@@ -9,14 +9,14 @@ const { isMaxscale } = require('../base');
 
 describe('server additional information API', () => {
   it('server version', async function () {
-    if (isMaxscale() || process.env.srv === 'build') this.skip();
+    if (isMaxscale()) this.skip();
 
     const res = await shareConn.query('SELECT VERSION() a');
     assert.deepEqual(res, [{ a: shareConn.serverVersion() }]);
   });
 
   it('server type', function () {
-    if (!process.env.srv) this.skip();
-    assert.equal(process.env.srv !== 'mysql', shareConn.info.isMariaDB());
+    if (!process.env.DB_TYPE) this.skip();
+    assert.equal(process.env.DB_TYPE !== 'mysql', shareConn.info.isMariaDB());
   });
 });

test/integration/test-connection-meta.js

@@ -1,5 +1,5 @@
 //  SPDX-License-Identifier: LGPL-2.1-or-later
-//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+//  Copyright (c) 2015-2025 MariaDB Corporation Ab
 
 'use strict';
 
@@ -10,12 +10,10 @@ const assert = require('chai').assert;
 describe('Connection meta', function () {
   it('server version', () => {
     const serverVersion = shareConn.serverVersion();
-    if (process.env.srv) {
-      if (!isMaxscale()) {
-        const version = process.env.v;
-        if (version && !version.includes('-rc')) {
-          assert(serverVersion.startsWith(version), serverVersion + '/' + version);
-        }
+    if (!isMaxscale()) {
+      const version = process.env.DB_VERSION;
+      if (version && !version.includes('-rc')) {
+        assert(serverVersion.startsWith(version), serverVersion + '/' + version);
       }
     }
   });
@@ -34,8 +32,8 @@ describe('Connection meta', function () {
 
   it('isMariaDB', () => {
     const isMariadb = shareConn.info.isMariaDB();
-    if (process.env.srv) {
-      assert.equal(isMariadb, !process.env.srv.startsWith('mysql'));
+    if (process.env.DB_TYPE) {
+      assert.equal(isMariadb, !process.env.DB_TYPE.startsWith('mysql'));
     }
   });
 

test/integration/test-connection-opts.js

@@ -1,5 +1,5 @@
 //  SPDX-License-Identifier: LGPL-2.1-or-later
-//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+//  Copyright (c) 2015-2025 MariaDB Corporation Ab
 
 'use strict';
 
@@ -21,7 +21,7 @@ describe('connection option', () => {
   });
 
   it('collation with no id', async function () {
-    if (process.env.srv === 'mariadb-es' || process.env.srv === 'mariadb-es-test') this.skip();
+    if (process.env.DB_TYPE === 'enterprise') this.skip();
     if (!shareConn.info.isMariaDB() || !shareConn.info.hasMinVersion(11, 2, 0)) this.skip();
     const conn = await base.createConnection();
     await conn.query('set NAMES utf8mb4 COLLATE uca1400_vietnamese_ai_ci');