From c954ad0d78cb53dc33bfe24bfaa755a26892917a Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Tue, 17 Mar 2026 20:49:12 +0100 Subject: [PATCH 1/7] PMM-7: Fix upgrade test --- tests/upgrade/advisorsAlerting_test.js | 10 +++++----- tests/upgrade/annotationsPrometheus_test.js | 2 +- tests/upgrade/customPassword_test.js | 4 ++-- tests/upgrade/dashboards_test.js | 12 ++++++------ tests/upgrade/externalService_test.js | 10 +++++----- tests/upgrade/settingsMetrics_test.js | 10 +++++----- tests/upgrade/ssl_test.js | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/upgrade/advisorsAlerting_test.js b/tests/upgrade/advisorsAlerting_test.js index 579d3d785..90717d764 100644 --- a/tests/upgrade/advisorsAlerting_test.js +++ b/tests/upgrade/advisorsAlerting_test.js @@ -59,7 +59,7 @@ Scenario('Disable advisor before upgrade @pre-advisors-alerting-upgrade', async }); Scenario( - 'Verify advisors intervals remain the same after upgrade @post-advisors-alerting-upgrade', + 'Verify advisors intervals remain the same after upgrade @post-advisors-alerting-upgrade @post-upgrade', async ({ I, advisorsPage, @@ -74,7 +74,7 @@ Scenario( ); Scenario( - 'Verify disabled advisor remain disabled after upgrade @post-advisors-alerting-upgrade', + 'Verify disabled advisor remain disabled after upgrade @post-advisors-alerting-upgrade @post-upgrade', async ({ I, advisorsPage, @@ -126,7 +126,7 @@ Scenario( ); Scenario( - 'Verify settings for intervals remain the same after upgrade @post-advisors-alerting-upgrade', + 'Verify settings for intervals remain the same after upgrade @post-advisors-alerting-upgrade @post-upgrade', async ({ I, pmmSettingsPage, @@ -141,7 +141,7 @@ Scenario( ); Scenario( - 'PMM-T577 Verify user can see IA alerts after upgrade @post-advisors-alerting-upgrade', + 'PMM-T577 Verify user can see IA alerts after upgrade @post-advisors-alerting-upgrade @post-upgrade', async ({ I, alertsPage, alertsAPI, }) => { @@ -159,7 +159,7 @@ Scenario( ); Scenario( - 'PMM-T268 - Verify Failed check singlestats after upgrade from old versions @post-advisors-alerting-upgrade', + 'PMM-T268 - Verify Failed check singlestats after upgrade from old versions @post-advisors-alerting-upgrade @post-upgrade', async ({ I, homePage, }) => { diff --git a/tests/upgrade/annotationsPrometheus_test.js b/tests/upgrade/annotationsPrometheus_test.js index e835ae707..e65938c5d 100644 --- a/tests/upgrade/annotationsPrometheus_test.js +++ b/tests/upgrade/annotationsPrometheus_test.js @@ -33,7 +33,7 @@ Data(clientDbServices).Scenario( ); Data(clientDbServices).Scenario( - 'Verify added Annotations at service level, also available post upgrade @post-client-upgrade @post-annotations-prometheus-upgrade', + 'Verify added Annotations at service level, also available post upgrade @post-client-upgrade @post-annotations-prometheus-upgrade @post-upgrade', async ({ I, dashboardPage, current, inventoryAPI, }) => { diff --git a/tests/upgrade/customPassword_test.js b/tests/upgrade/customPassword_test.js index 92f733dcb..6f690ff6e 100644 --- a/tests/upgrade/customPassword_test.js +++ b/tests/upgrade/customPassword_test.js @@ -52,7 +52,7 @@ Data(clientDbServices).Scenario( ); Data(clientDbServices).Scenario( - 'Verify if Agents added with custom password and custom label work as expected Post Upgrade @post-client-upgrade @post-custom-password-upgrade', + 'Verify if Agents added with custom password and custom label work as expected Post Upgrade @post-client-upgrade @post-custom-password-upgrade @post-upgrade', async ({ current, inventoryAPI, grafanaAPI, }) => { @@ -70,7 +70,7 @@ Data(clientDbServices).Scenario( ); Scenario( - 'PMM-T1189 - verify user is able to change password after upgrade @post-custom-password-upgrade', + 'PMM-T1189 - verify user is able to change password after upgrade @post-custom-password-upgrade @post-upgrade', async ({ I, homePage, profileAPI }) => { const newPass = process.env.NEW_ADMIN_PASSWORD || 'admin1'; diff --git a/tests/upgrade/dashboards_test.js b/tests/upgrade/dashboards_test.js index 2a2f84669..842aa7f90 100644 --- a/tests/upgrade/dashboards_test.js +++ b/tests/upgrade/dashboards_test.js @@ -60,7 +60,7 @@ Scenario( ); Scenario( - 'PMM-T391 + PMM-T1818 - Verify that custom home dashboard stays as home dashboard after upgrade @post-dashboards-upgrade', + 'PMM-T391 + PMM-T1818 - Verify that custom home dashboard stays as home dashboard after upgrade @post-dashboards-upgrade @post-upgrade', async ({ I, grafanaAPI, dashboardPage }) => { I.amOnPage('/pmm-ui/'); dashboardPage.waitForDashboardOpened(); @@ -87,7 +87,7 @@ Scenario( ); Scenario( - 'PMM-T998 - Verify dashboard folders after upgrade @post-dashboards-upgrade', + 'PMM-T998 - Verify dashboard folders after upgrade @post-dashboards-upgrade @post-upgrade', async ({ I, searchDashboardsModal, grafanaAPI, homePage, dashboardPage, }) => { @@ -104,7 +104,7 @@ Scenario( ); Scenario( - 'PMM-T1091 - Verify PMM Dashboards folders are correct @post-dashboards-upgrade', + 'PMM-T1091 - Verify PMM Dashboards folders are correct @post-dashboards-upgrade @post-upgrade', async ({ I, searchDashboardsModal, }) => { @@ -121,7 +121,7 @@ Scenario( ); Scenario( - 'PMM-T1003 - Verify UI upgrade with Custom dashboard @post-dashboards-upgrade', + 'PMM-T1003 - Verify UI upgrade with Custom dashboard @post-dashboards-upgrade @post-upgrade', async ({ I, searchDashboardsModal, grafanaAPI, homePage, dashboardPage, }) => { @@ -136,7 +136,7 @@ Scenario( ); Scenario( - 'PMM-T424 Verify PT Summary Panel is available after Upgrade @post-dashboards-upgrade', + 'PMM-T424 Verify PT Summary Panel is available after Upgrade @post-dashboards-upgrade @post-upgrade', async ({ I, dashboardPage }) => { const filter = 'Node Name'; @@ -151,7 +151,7 @@ Scenario( ); Scenario( - 'PMM-12587-2 Verify duplicate dashboards dont break after upgrade @post-dashboards-upgrade', + 'PMM-12587-2 Verify duplicate dashboards dont break after upgrade @post-dashboards-upgrade @post-upgrade', async ({ I, grafanaAPI, dashboardPage, }) => { diff --git a/tests/upgrade/externalService_test.js b/tests/upgrade/externalService_test.js index c6aaebc81..6fee5a84b 100644 --- a/tests/upgrade/externalService_test.js +++ b/tests/upgrade/externalService_test.js @@ -36,7 +36,7 @@ Data(remoteUpgradeInstances).Scenario( ); Scenario( - 'Verify Redis as external Service Works After Upgrade @post-external-upgrade @post-client-upgrade', + 'Verify Redis as external Service Works After Upgrade @post-external-upgrade @post-client-upgrade @post-upgrade', async ({ I, grafanaAPI, remoteInstancesHelper, }) => { @@ -75,7 +75,7 @@ Scenario( ).retry(2); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2073 - Verify Agents are RUNNING after Upgrade (API) [critical] @post-external-upgrade @post-client-upgrade', + 'PMM-T2073 - Verify Agents are RUNNING after Upgrade (API) [critical] @post-external-upgrade @post-client-upgrade @post-upgrade', async ({ inventoryAPI, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); @@ -84,7 +84,7 @@ Data(remoteUpgradeInstances).Scenario( ); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2072 - Verify Agents are RUNNING after Upgrade (UI) [critical] @post-external-upgrade @post-client-upgrade', + 'PMM-T2072 - Verify Agents are RUNNING after Upgrade (UI) [critical] @post-external-upgrade @post-client-upgrade @post-upgrade', async ({ I, pmmInventoryPage, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); @@ -95,7 +95,7 @@ Data(remoteUpgradeInstances).Scenario( ); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2071 - Verify Agents are Running and Metrics are being collected Pre and Post Upgrade (API) [critical] @pre-external-upgrade @post-external-upgrade @post-client-upgrade', + 'PMM-T2071 - Verify Agents are Running and Metrics are being collected Pre and Post Upgrade (API) [critical] @pre-external-upgrade @post-external-upgrade @post-client-upgrade @post-upgrade', async ({ I, grafanaAPI, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); @@ -104,7 +104,7 @@ Data(remoteUpgradeInstances).Scenario( ); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2070 - Verify QAN has specific filters for Remote Instances after Upgrade (UI) @post-external-upgrade @post-client-upgrade', + 'PMM-T2070 - Verify QAN has specific filters for Remote Instances after Upgrade (UI) @post-external-upgrade @post-client-upgrade @post-upgrade', async ({ I, queryAnalyticsPage, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); diff --git a/tests/upgrade/settingsMetrics_test.js b/tests/upgrade/settingsMetrics_test.js index 1a3481b61..abc31459e 100644 --- a/tests/upgrade/settingsMetrics_test.js +++ b/tests/upgrade/settingsMetrics_test.js @@ -31,7 +31,7 @@ Scenario( ); Scenario( - 'PMM-T262 Open PMM Settings page and verify DATA_RETENTION value is set to 2 days, Custom Resolution is still preserved after upgrade @post-settings-metrics-upgrade @post-upgrade', + 'PMM-T262 Open PMM Settings page and verify DATA_RETENTION value is set to 2 days, Custom Resolution is still preserved after upgrade @post-upgrade', async ({ I, pmmSettingsPage }) => { const advancedSection = pmmSettingsPage.sectionTabsList.advanced; const metricResolutionSection = pmmSettingsPage.sectionTabsList.metrics; @@ -52,7 +52,7 @@ Scenario( Data(clientDbServices) .Scenario( - 'Check Metrics for Client Nodes [critical] @post-settings-metrics-upgrade @post-client-upgrade', + 'Check Metrics for Client Nodes [critical] @post-settings-metrics-upgrade @post-client-upgrade @post-upgrade', async ({ inventoryAPI, grafanaAPI, @@ -69,7 +69,7 @@ Data(clientDbServices) ); Scenario( - 'Verify Metrics from custom queries for mysqld_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade', + 'Verify Metrics from custom queries for mysqld_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade @post-upgrade', async ({ I, grafanaAPI, inventoryAPI }) => { const metricName = 'mysql_performance_schema_memory_summary_current_bytes'; const apiServiceDetails = await inventoryAPI.getServiceDetailsByPartialName('ps_pmm'); @@ -79,7 +79,7 @@ Scenario( ); Scenario( - 'Verify textfile collector extend metrics is still collected post upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade', + 'Verify textfile collector extend metrics is still collected post upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade @post-upgrade', async ({ grafanaAPI }) => { const metricName = 'node_role'; @@ -88,7 +88,7 @@ Scenario( ); Scenario( - 'Verify Metrics from custom queries for postgres_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade', + 'Verify Metrics from custom queries for postgres_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade @post-upgrade', async ({ grafanaAPI, inventoryAPI, I }) => { const metricName = 'pg_stat_user_tables_analyze_count'; const apiServiceDetails = await inventoryAPI.getServiceDetailsByPartialName('pgsql_pgs'); diff --git a/tests/upgrade/ssl_test.js b/tests/upgrade/ssl_test.js index 64f1da0a5..87046eea1 100644 --- a/tests/upgrade/ssl_test.js +++ b/tests/upgrade/ssl_test.js @@ -103,7 +103,7 @@ Data(sslinstances).Scenario( ); Data(sslinstances).Scenario( - 'Verify metrics from SSL instances on PMM-Server @post-ssl-upgrade', + 'Verify metrics from SSL instances on PMM-Server @post-ssl-upgrade @post-upgrade', async ({ I, current, grafanaAPI, inventoryAPI, }) => { @@ -125,7 +125,7 @@ Data(sslinstances).Scenario( ); Data(sslinstances).Scenario( - 'Verify dashboard for SSL Instances and services after upgrade @post-ssl-upgrade', + 'Verify dashboard for SSL Instances and services after upgrade @post-ssl-upgrade @post-upgrade', async ({ I, dashboardPage, adminPage, current, inventoryAPI, }) => { @@ -151,7 +151,7 @@ Data(sslinstances).Scenario( ).retry(1); Data(sslinstances).Scenario( - 'Verify QAN after upgrade for SSL Instances added @post-ssl-upgrade', + 'Verify QAN after upgrade for SSL Instances added @post-ssl-upgrade @post-upgrade', async ({ I, queryAnalyticsPage, current, adminPage, inventoryAPI, }) => { From 97ab67c027d0501a487a2c40c1ce85e6e9fcf667 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 18 Mar 2026 09:25:00 +0100 Subject: [PATCH 2/7] PMM-7: Fix upgrade test --- tests/upgrade/advisorsAlerting_test.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/upgrade/advisorsAlerting_test.js b/tests/upgrade/advisorsAlerting_test.js index 90717d764..5b215e02b 100644 --- a/tests/upgrade/advisorsAlerting_test.js +++ b/tests/upgrade/advisorsAlerting_test.js @@ -90,19 +90,6 @@ Scenario( }, ); -Scenario( - 'PMM-T577 Verify user is able to see IA alerts before upgrade @pre-advisors-alerting-upgrade', - async ({ - settingsAPI, rulesAPI, alertsAPI, - }) => { - await settingsAPI.changeSettings({ alerting: true }); - await rulesAPI.removeAllAlertRules(true); - await rulesAPI.createAlertRule({ ruleName }, 'Insight'); - // Wait for alert to appear - await alertsAPI.waitForAlerts(60, 1); - }, -); - const rareInterval = '48'; const standardInterval = '12'; const frequentInterval = '2'; From 50c4120b0dc6edb906123b6772ce209792c2191e Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 18 Mar 2026 09:37:50 +0100 Subject: [PATCH 3/7] PMM-7: Fix upgrade test --- tests/upgrade/advisorsAlerting_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/upgrade/advisorsAlerting_test.js b/tests/upgrade/advisorsAlerting_test.js index 5b215e02b..3eaab921a 100644 --- a/tests/upgrade/advisorsAlerting_test.js +++ b/tests/upgrade/advisorsAlerting_test.js @@ -136,7 +136,7 @@ Scenario( I.amOnPage(alertsPage.url); - // await alertsAPI.waitForAlerts(120, 1); + await alertsAPI.waitForAlerts(120, 1); const alerts = await alertsAPI.getAlertsList(); assert.ok(alerts[0].annotations.summary.includes(alertName), `Didn't find alert with name ${alertName}`); From 987b974ac4f0490b0884f338b02d642b465b37a5 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Wed, 18 Mar 2026 09:59:12 +0100 Subject: [PATCH 4/7] PMM-7: Fix upgrade test --- tests/upgrade/advisorsAlerting_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/upgrade/advisorsAlerting_test.js b/tests/upgrade/advisorsAlerting_test.js index 3eaab921a..5f9ad6440 100644 --- a/tests/upgrade/advisorsAlerting_test.js +++ b/tests/upgrade/advisorsAlerting_test.js @@ -136,7 +136,7 @@ Scenario( I.amOnPage(alertsPage.url); - await alertsAPI.waitForAlerts(120, 1); + await alertsAPI.waitForAlerts(10, 1); const alerts = await alertsAPI.getAlertsList(); assert.ok(alerts[0].annotations.summary.includes(alertName), `Didn't find alert with name ${alertName}`); From 1f4a9ffa37e477fc97e6541172923f76287dd7e4 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Thu, 19 Mar 2026 09:41:08 +0100 Subject: [PATCH 5/7] PMM-7: Refactor tests --- tests/upgrade/advisorsAlerting_test.js | 10 +++++----- tests/upgrade/annotationsPrometheus_test.js | 2 +- tests/upgrade/customPassword_test.js | 4 ++-- tests/upgrade/dashboards_test.js | 12 ++++++------ tests/upgrade/externalService_test.js | 10 +++++----- tests/upgrade/settingsMetrics_test.js | 10 +++++----- tests/upgrade/ssl_test.js | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/upgrade/advisorsAlerting_test.js b/tests/upgrade/advisorsAlerting_test.js index 5f9ad6440..b69d09348 100644 --- a/tests/upgrade/advisorsAlerting_test.js +++ b/tests/upgrade/advisorsAlerting_test.js @@ -59,7 +59,7 @@ Scenario('Disable advisor before upgrade @pre-advisors-alerting-upgrade', async }); Scenario( - 'Verify advisors intervals remain the same after upgrade @post-advisors-alerting-upgrade @post-upgrade', + 'Verify advisors intervals remain the same after upgrade @post-advisors-alerting-upgrade', async ({ I, advisorsPage, @@ -74,7 +74,7 @@ Scenario( ); Scenario( - 'Verify disabled advisor remain disabled after upgrade @post-advisors-alerting-upgrade @post-upgrade', + 'Verify disabled advisor remain disabled after upgrade @post-advisors-alerting-upgrade', async ({ I, advisorsPage, @@ -113,7 +113,7 @@ Scenario( ); Scenario( - 'Verify settings for intervals remain the same after upgrade @post-advisors-alerting-upgrade @post-upgrade', + 'Verify settings for intervals remain the same after upgrade @post-advisors-alerting-upgrade', async ({ I, pmmSettingsPage, @@ -128,7 +128,7 @@ Scenario( ); Scenario( - 'PMM-T577 Verify user can see IA alerts after upgrade @post-advisors-alerting-upgrade @post-upgrade', + 'PMM-T577 Verify user can see IA alerts after upgrade @post-advisors-alerting-upgrade', async ({ I, alertsPage, alertsAPI, }) => { @@ -146,7 +146,7 @@ Scenario( ); Scenario( - 'PMM-T268 - Verify Failed check singlestats after upgrade from old versions @post-advisors-alerting-upgrade @post-upgrade', + 'PMM-T268 - Verify Failed check singlestats after upgrade from old versions @post-advisors-alerting-upgrade', async ({ I, homePage, }) => { diff --git a/tests/upgrade/annotationsPrometheus_test.js b/tests/upgrade/annotationsPrometheus_test.js index e65938c5d..e835ae707 100644 --- a/tests/upgrade/annotationsPrometheus_test.js +++ b/tests/upgrade/annotationsPrometheus_test.js @@ -33,7 +33,7 @@ Data(clientDbServices).Scenario( ); Data(clientDbServices).Scenario( - 'Verify added Annotations at service level, also available post upgrade @post-client-upgrade @post-annotations-prometheus-upgrade @post-upgrade', + 'Verify added Annotations at service level, also available post upgrade @post-client-upgrade @post-annotations-prometheus-upgrade', async ({ I, dashboardPage, current, inventoryAPI, }) => { diff --git a/tests/upgrade/customPassword_test.js b/tests/upgrade/customPassword_test.js index 6f690ff6e..92f733dcb 100644 --- a/tests/upgrade/customPassword_test.js +++ b/tests/upgrade/customPassword_test.js @@ -52,7 +52,7 @@ Data(clientDbServices).Scenario( ); Data(clientDbServices).Scenario( - 'Verify if Agents added with custom password and custom label work as expected Post Upgrade @post-client-upgrade @post-custom-password-upgrade @post-upgrade', + 'Verify if Agents added with custom password and custom label work as expected Post Upgrade @post-client-upgrade @post-custom-password-upgrade', async ({ current, inventoryAPI, grafanaAPI, }) => { @@ -70,7 +70,7 @@ Data(clientDbServices).Scenario( ); Scenario( - 'PMM-T1189 - verify user is able to change password after upgrade @post-custom-password-upgrade @post-upgrade', + 'PMM-T1189 - verify user is able to change password after upgrade @post-custom-password-upgrade', async ({ I, homePage, profileAPI }) => { const newPass = process.env.NEW_ADMIN_PASSWORD || 'admin1'; diff --git a/tests/upgrade/dashboards_test.js b/tests/upgrade/dashboards_test.js index 842aa7f90..2a2f84669 100644 --- a/tests/upgrade/dashboards_test.js +++ b/tests/upgrade/dashboards_test.js @@ -60,7 +60,7 @@ Scenario( ); Scenario( - 'PMM-T391 + PMM-T1818 - Verify that custom home dashboard stays as home dashboard after upgrade @post-dashboards-upgrade @post-upgrade', + 'PMM-T391 + PMM-T1818 - Verify that custom home dashboard stays as home dashboard after upgrade @post-dashboards-upgrade', async ({ I, grafanaAPI, dashboardPage }) => { I.amOnPage('/pmm-ui/'); dashboardPage.waitForDashboardOpened(); @@ -87,7 +87,7 @@ Scenario( ); Scenario( - 'PMM-T998 - Verify dashboard folders after upgrade @post-dashboards-upgrade @post-upgrade', + 'PMM-T998 - Verify dashboard folders after upgrade @post-dashboards-upgrade', async ({ I, searchDashboardsModal, grafanaAPI, homePage, dashboardPage, }) => { @@ -104,7 +104,7 @@ Scenario( ); Scenario( - 'PMM-T1091 - Verify PMM Dashboards folders are correct @post-dashboards-upgrade @post-upgrade', + 'PMM-T1091 - Verify PMM Dashboards folders are correct @post-dashboards-upgrade', async ({ I, searchDashboardsModal, }) => { @@ -121,7 +121,7 @@ Scenario( ); Scenario( - 'PMM-T1003 - Verify UI upgrade with Custom dashboard @post-dashboards-upgrade @post-upgrade', + 'PMM-T1003 - Verify UI upgrade with Custom dashboard @post-dashboards-upgrade', async ({ I, searchDashboardsModal, grafanaAPI, homePage, dashboardPage, }) => { @@ -136,7 +136,7 @@ Scenario( ); Scenario( - 'PMM-T424 Verify PT Summary Panel is available after Upgrade @post-dashboards-upgrade @post-upgrade', + 'PMM-T424 Verify PT Summary Panel is available after Upgrade @post-dashboards-upgrade', async ({ I, dashboardPage }) => { const filter = 'Node Name'; @@ -151,7 +151,7 @@ Scenario( ); Scenario( - 'PMM-12587-2 Verify duplicate dashboards dont break after upgrade @post-dashboards-upgrade @post-upgrade', + 'PMM-12587-2 Verify duplicate dashboards dont break after upgrade @post-dashboards-upgrade', async ({ I, grafanaAPI, dashboardPage, }) => { diff --git a/tests/upgrade/externalService_test.js b/tests/upgrade/externalService_test.js index 6fee5a84b..c6aaebc81 100644 --- a/tests/upgrade/externalService_test.js +++ b/tests/upgrade/externalService_test.js @@ -36,7 +36,7 @@ Data(remoteUpgradeInstances).Scenario( ); Scenario( - 'Verify Redis as external Service Works After Upgrade @post-external-upgrade @post-client-upgrade @post-upgrade', + 'Verify Redis as external Service Works After Upgrade @post-external-upgrade @post-client-upgrade', async ({ I, grafanaAPI, remoteInstancesHelper, }) => { @@ -75,7 +75,7 @@ Scenario( ).retry(2); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2073 - Verify Agents are RUNNING after Upgrade (API) [critical] @post-external-upgrade @post-client-upgrade @post-upgrade', + 'PMM-T2073 - Verify Agents are RUNNING after Upgrade (API) [critical] @post-external-upgrade @post-client-upgrade', async ({ inventoryAPI, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); @@ -84,7 +84,7 @@ Data(remoteUpgradeInstances).Scenario( ); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2072 - Verify Agents are RUNNING after Upgrade (UI) [critical] @post-external-upgrade @post-client-upgrade @post-upgrade', + 'PMM-T2072 - Verify Agents are RUNNING after Upgrade (UI) [critical] @post-external-upgrade @post-client-upgrade', async ({ I, pmmInventoryPage, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); @@ -95,7 +95,7 @@ Data(remoteUpgradeInstances).Scenario( ); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2071 - Verify Agents are Running and Metrics are being collected Pre and Post Upgrade (API) [critical] @pre-external-upgrade @post-external-upgrade @post-client-upgrade @post-upgrade', + 'PMM-T2071 - Verify Agents are Running and Metrics are being collected Pre and Post Upgrade (API) [critical] @pre-external-upgrade @post-external-upgrade @post-client-upgrade', async ({ I, grafanaAPI, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); @@ -104,7 +104,7 @@ Data(remoteUpgradeInstances).Scenario( ); Data(remoteUpgradeInstances).Scenario( - 'PMM-T2070 - Verify QAN has specific filters for Remote Instances after Upgrade (UI) @post-external-upgrade @post-client-upgrade @post-upgrade', + 'PMM-T2070 - Verify QAN has specific filters for Remote Instances after Upgrade (UI) @post-external-upgrade @post-client-upgrade', async ({ I, queryAnalyticsPage, current }) => { const remoteInstance = remoteInstancesFixture.getUpgradeRemoteServiceByName(current); diff --git a/tests/upgrade/settingsMetrics_test.js b/tests/upgrade/settingsMetrics_test.js index abc31459e..1a3481b61 100644 --- a/tests/upgrade/settingsMetrics_test.js +++ b/tests/upgrade/settingsMetrics_test.js @@ -31,7 +31,7 @@ Scenario( ); Scenario( - 'PMM-T262 Open PMM Settings page and verify DATA_RETENTION value is set to 2 days, Custom Resolution is still preserved after upgrade @post-upgrade', + 'PMM-T262 Open PMM Settings page and verify DATA_RETENTION value is set to 2 days, Custom Resolution is still preserved after upgrade @post-settings-metrics-upgrade @post-upgrade', async ({ I, pmmSettingsPage }) => { const advancedSection = pmmSettingsPage.sectionTabsList.advanced; const metricResolutionSection = pmmSettingsPage.sectionTabsList.metrics; @@ -52,7 +52,7 @@ Scenario( Data(clientDbServices) .Scenario( - 'Check Metrics for Client Nodes [critical] @post-settings-metrics-upgrade @post-client-upgrade @post-upgrade', + 'Check Metrics for Client Nodes [critical] @post-settings-metrics-upgrade @post-client-upgrade', async ({ inventoryAPI, grafanaAPI, @@ -69,7 +69,7 @@ Data(clientDbServices) ); Scenario( - 'Verify Metrics from custom queries for mysqld_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade @post-upgrade', + 'Verify Metrics from custom queries for mysqld_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade', async ({ I, grafanaAPI, inventoryAPI }) => { const metricName = 'mysql_performance_schema_memory_summary_current_bytes'; const apiServiceDetails = await inventoryAPI.getServiceDetailsByPartialName('ps_pmm'); @@ -79,7 +79,7 @@ Scenario( ); Scenario( - 'Verify textfile collector extend metrics is still collected post upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade @post-upgrade', + 'Verify textfile collector extend metrics is still collected post upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade', async ({ grafanaAPI }) => { const metricName = 'node_role'; @@ -88,7 +88,7 @@ Scenario( ); Scenario( - 'Verify Metrics from custom queries for postgres_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade @post-upgrade', + 'Verify Metrics from custom queries for postgres_exporter after upgrade (UI) @post-client-upgrade @post-settings-metrics-upgrade', async ({ grafanaAPI, inventoryAPI, I }) => { const metricName = 'pg_stat_user_tables_analyze_count'; const apiServiceDetails = await inventoryAPI.getServiceDetailsByPartialName('pgsql_pgs'); diff --git a/tests/upgrade/ssl_test.js b/tests/upgrade/ssl_test.js index 87046eea1..64f1da0a5 100644 --- a/tests/upgrade/ssl_test.js +++ b/tests/upgrade/ssl_test.js @@ -103,7 +103,7 @@ Data(sslinstances).Scenario( ); Data(sslinstances).Scenario( - 'Verify metrics from SSL instances on PMM-Server @post-ssl-upgrade @post-upgrade', + 'Verify metrics from SSL instances on PMM-Server @post-ssl-upgrade', async ({ I, current, grafanaAPI, inventoryAPI, }) => { @@ -125,7 +125,7 @@ Data(sslinstances).Scenario( ); Data(sslinstances).Scenario( - 'Verify dashboard for SSL Instances and services after upgrade @post-ssl-upgrade @post-upgrade', + 'Verify dashboard for SSL Instances and services after upgrade @post-ssl-upgrade', async ({ I, dashboardPage, adminPage, current, inventoryAPI, }) => { @@ -151,7 +151,7 @@ Data(sslinstances).Scenario( ).retry(1); Data(sslinstances).Scenario( - 'Verify QAN after upgrade for SSL Instances added @post-ssl-upgrade @post-upgrade', + 'Verify QAN after upgrade for SSL Instances added @post-ssl-upgrade', async ({ I, queryAnalyticsPage, current, adminPage, inventoryAPI, }) => { From 180d278a0e5ba221f00a3b1818466985cec26c3b Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Sun, 22 Mar 2026 16:30:36 +0100 Subject: [PATCH 6/7] PMM-7: Refactor tests --- tests/pages/components/updatesAvailableModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pages/components/updatesAvailableModal.js b/tests/pages/components/updatesAvailableModal.js index a83d6313d..691a2d809 100644 --- a/tests/pages/components/updatesAvailableModal.js +++ b/tests/pages/components/updatesAvailableModal.js @@ -3,7 +3,7 @@ const { I } = inject(); class UpdatesAvailableModalComponent { constructor() { this.root = locate('//*[contains(@class, "MuiStack-root")]'); - this.closeIcon = this.root.find('//*[@data-testid="CloseIcon"]'); + this.closeIcon = this.root.find('//*[@data-testid="CloseIcon" or @data-testid="modal-close-button"]'); this.dismissButton = this.root.find('button').withText('Dismiss'); this.goToUpdatesPage = this.root.find('button').withText('Go to updates page'); } From 78140486f49b93a39fa63b09d399bb686feb7fd5 Mon Sep 17 00:00:00 2001 From: Peter Sirotnak Date: Sun, 22 Mar 2026 16:32:37 +0100 Subject: [PATCH 7/7] PMM-7: Refactor tests --- tests/upgrade/dashboards_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/upgrade/dashboards_test.js b/tests/upgrade/dashboards_test.js index 2f5e56777..a190feabb 100644 --- a/tests/upgrade/dashboards_test.js +++ b/tests/upgrade/dashboards_test.js @@ -31,7 +31,7 @@ Scenario( await grafanaAPI.starDashboard(resp.id); await grafanaAPI.setHomeDashboard(resp.id); - I.amOnPage(''); + I.amOnPage('pmm-ui/graph/'); dashboardPage.waitForDashboardOpened(); await dashboardPage.verifyMetricsExistence([additionalPanelName]); I.seeInCurrentUrl(grafanaAPI.customDashboardName);