PMM-7 go back to ps5.7 for remote instances

percona · Nov 21, 2024 · 1877d19 · 1877d19
1 parent b8b41e8
commit 1877d19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -52,6 +52,7 @@ services:
       - UMASK=0777  # for slowlog file
     volumes:
       - /tmp/mysql/log:/tmp/mysql/log:rw
+      - ./testdata/docker-db-setup-scripts/init_ps_5_7.sql:/docker-entrypoint-initdb.d/init.sql
     networks:
       - pmm-network
 
@@ -63,6 +64,8 @@ services:
       --performance-schema --innodb_monitor_enable=all --userstat
       --slow_query_log --log_slow_rate_limit=1 --log_slow_admin_statements --log_slow_slave_statements --slow_query_log_file=/tmp/mysql/log/ps8_slow_log.log --long_query_time=0
       --character-set-server=utf8 --default-authentication-plugin=mysql_native_password --collation-server=utf8_unicode_ci
+    ports:
+      - "3307:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=^O6VrIoC1@9b
       - MYSQL_USER=pmm-agent

diff --git a/testdata/docker-db-setup-scripts/init_ps_5_7.sql b/testdata/docker-db-setup-scripts/init_ps_5_7.sql
@@ -0,0 +1,3 @@
+CREATE USER IF NOT EXISTS 'pmm-agent'@'%' IDENTIFIED BY 'pmm%*&agent-password';
+GRANT SELECT, PROCESS, REPLICATION CLIENT, RELOAD, BACKUP_ADMIN ON *.* TO 'pmm-agent'@'%';
+FLUSH PRIVILEGES;
diff --git a/tests/remoteInstances/remoteInstancesHelper.js b/tests/remoteInstances/remoteInstancesHelper.js
@@ -390,7 +390,7 @@ module.exports = {
 
   // Used for Adding Remote Instance during Upgrade Tests runs for AMI and Docker via API
   instanceTypes: {
-    mysql: (remoteInstanceStatus.mysql.ps_8_0.enabled ? 'MySQL' : undefined),
+    mysql: (remoteInstanceStatus.mysql.ps_5_7.enabled ? 'MySQL' : undefined),
     postgresql: (remoteInstanceStatus.postgresql.pdpgsql_13_3.enabled ? 'PostgreSQL' : undefined),
     mongodb: (remoteInstanceStatus.mongodb.psmdb_4_2.enabled ? 'MongoDB' : undefined),
     proxysql: (remoteInstanceStatus.proxysql.proxysql_2_1_1.enabled ? 'ProxySQL' : undefined),
@@ -402,7 +402,7 @@ module.exports = {
   // Generic object for each service type, used by both UI/Upgrade jobs depending on the service being used - don't add RDS here
   serviceTypes: {
     mysql: (
-      remoteInstanceStatus.mysql.ps_8_0.enabled ? {
+      remoteInstanceStatus.mysql.ps_5_7.enabled ? {
         serviceType: SERVICE_TYPE.MYSQL,
         service: 'mysql',
       } : undefined
@@ -453,7 +453,7 @@ module.exports = {
 
   // General Remote Instances Service List, this is what UI-tests job uses to run remote instances tests.
   services: {
-    mysql: (remoteInstanceStatus.mysql.ps_8_0.enabled ? 'mysql_remote_new' : undefined),
+    mysql: (remoteInstanceStatus.mysql.ps_5_7.enabled ? 'mysql_remote_new' : undefined),
     mongodb: (remoteInstanceStatus.mongodb.psmdb_4_2.enabled ? 'mongodb_remote_new' : undefined),
     postgresql: (remoteInstanceStatus.postgresql.pdpgsql_13_3.enabled ? 'postgresql_remote_new' : undefined),
     proxysql: (remoteInstanceStatus.proxysql.proxysql_2_1_1.enabled ? 'proxysql_remote_new' : undefined),
@@ -465,7 +465,7 @@ module.exports = {
 
   // Only add a service here when you want to include it as part of Upgrade tests cycle for AMI and Docker
   upgradeServiceNames: {
-    mysql: (remoteInstanceStatus.mysql.ps_8_0.enabled ? 'mysql_upgrade_service' : undefined),
+    mysql: (remoteInstanceStatus.mysql.ps_5_7.enabled ? 'mysql_upgrade_service' : undefined),
     mongodb: (remoteInstanceStatus.mongodb.psmdb_4_2.enabled ? 'psmdb_upgrade_scervice' : undefined),
     proxysql: (remoteInstanceStatus.proxysql.proxysql_2_1_1.enabled ? 'proxysql_upgrade_service' : undefined),
     postgresql: (remoteInstanceStatus.postgresql.pdpgsql_13_3.enabled ? 'postgres_upgrade_service' : undefined),