diff --git a/README.md b/README.md index 76de71f8b..af24c202a 100644 --- a/README.md +++ b/README.md @@ -104,11 +104,11 @@ Execute command in the Project Root folder @not-ui-pipeline legacy/deprecated @not-pr-pipeline legacy/deprecated @cli cli related tests - @alerting-fb alerting related tests executed on FB + @fb-alerting alerting related tests executed on FB @advisors-fb advisors related tests executed on FB @bm-fb backup management related tests executed on FB - @instances-fb remote instances related tests executed on FB - @settings-fb settings related tests executed on FB + @fb-instances remote instances related tests executed on FB + @fb-settings settings related tests executed on FB ## Contributing diff --git a/tests/configuration/verifyPMMSettingsPageElements_test.js b/tests/configuration/verifyPMMSettingsPageElements_test.js index 6c9ff54d1..71dabe1f3 100644 --- a/tests/configuration/verifyPMMSettingsPageElements_test.js +++ b/tests/configuration/verifyPMMSettingsPageElements_test.js @@ -158,7 +158,7 @@ Scenario( ); Scenario( - '@PMM-T1820 - Verify DBaaS deprecation warning @settings @settings-fb', + '@PMM-T1820 - Verify DBaaS deprecation warning @settings @fb-settings', async ({ I, pmmSettingsPage, settingsAPI, dbaasPage, }) => { diff --git a/tests/ia/alertRules_test.js b/tests/ia/alertRules_test.js index e9a09452a..5539f26d2 100644 --- a/tests/ia/alertRules_test.js +++ b/tests/ia/alertRules_test.js @@ -90,7 +90,7 @@ Scenario( ); Scenario( - 'PMM-T1420 Verify user can create Percona templated alert @ia @alerting-fb', + 'PMM-T1420 Verify user can create Percona templated alert @ia @fb-alerting', async ({ I, alertRulesPage, rulesAPI }) => { const rule = page.rules[15]; const newRule = page.rules[0]; @@ -111,7 +111,7 @@ Scenario( // TODO: unskip in scope of https://perconadev.atlassian.net/browse/PMM-12938 Scenario.skip( - 'PMM-T2282 Verfied Alerting is able to monitor for "PMM Agent Down" @ia @alerting-fb', + 'PMM-T2282 Verfied Alerting is able to monitor for "PMM Agent Down" @ia @fb-alerting', async ({ I, alertRulesPage, rulesAPI }) => { const rule = page.rules[29]; const newRule = page.rules[30]; @@ -139,7 +139,7 @@ Scenario.skip( // TODO: check ovf failure Scenario( - 'PMM-T1430 Verify user can edit Percona templated alert @ia @not-ovf @alerting-fb', + 'PMM-T1430 Verify user can edit Percona templated alert @ia @not-ovf @fb-alerting', async ({ I, alertRulesPage, rulesAPI, }) => { @@ -165,7 +165,7 @@ Scenario( ); Scenario( - 'PMM-T1433 Verify user can delete Percona templated alert @ia @alerting-fb', + 'PMM-T1433 Verify user can delete Percona templated alert @ia @fb-alerting', async ({ I, alertRulesPage, rulesAPI, iaCommon, }) => { diff --git a/tests/ia/common_test.js b/tests/ia/common_test.js index 8f469a9dc..7b9f59516 100644 --- a/tests/ia/common_test.js +++ b/tests/ia/common_test.js @@ -8,7 +8,7 @@ Before(async ({ I, rulesAPI }) => { }); Scenario( - 'PMM-T643 Verify message about disabled IA @ia @alerting-fb', + 'PMM-T643 Verify message about disabled IA @ia @fb-alerting', async ({ I, pmmSettingsPage, codeceptjsConfig, }) => { @@ -26,7 +26,7 @@ Scenario( Scenario( 'PMM-T481 Verify IA tab bar, ' + 'PMM-T620 Verify after reloading the page user is on the same IA tab, ' - + 'PMM-T776 Verify that user is able to see valid HTML Title on alerts page @ia @alerting-fb', + + 'PMM-T776 Verify that user is able to see valid HTML Title on alerts page @ia @fb-alerting', async ({ I, alertRulesPage, ruleTemplatesPage, contactPointsPage, nPoliciesPage, silencesPage, alertGroupsPage, aiAdminPage, }) => { diff --git a/tests/ia/contactPoints_test.js b/tests/ia/contactPoints_test.js index 7c3639426..d4dc0efa4 100644 --- a/tests/ia/contactPoints_test.js +++ b/tests/ia/contactPoints_test.js @@ -65,7 +65,7 @@ Data(contactPoints).Scenario( Scenario( 'PMM-T1710 Verify saving a contact point when required info is missing, ' - + 'PMM-T1711 Verify contact point test @ia', + + 'PMM-T1711 Verify contact point test @fb-alerting', async ({ I, iaCommon }) => { await contactPointsPage.openContactPointsTab(); I.waitForVisible(contactPointsPage.buttons.newContactPoint, 10); diff --git a/tests/ia/pagination_test.js b/tests/ia/pagination_test.js index aea1920b1..ad762ce59 100644 --- a/tests/ia/pagination_test.js +++ b/tests/ia/pagination_test.js @@ -13,7 +13,7 @@ After(async ({ templatesAPI }) => { }); Scenario( - 'PMM-T632 PMM-T697 PMM-T701 PMM-T1251 Verify Pagination navigation @ia @grafana-pr', + 'PMM-T632 PMM-T697 PMM-T701 PMM-T1251 Verify Pagination navigation @fb-alerting @grafana-pr', async ({ I, iaCommon, }) => { @@ -144,7 +144,7 @@ Scenario( ); Scenario( - 'PMM-T662 PMM-T698 PMM-T702 PMM-T631 PMM-T1251 Pagination rows per page persistence @ia', + 'PMM-T662 PMM-T698 PMM-T702 PMM-T631 PMM-T1251 Pagination rows per page persistence @fb-alerting', async ({ I, iaCommon, }) => { @@ -219,7 +219,7 @@ Scenario( ); Scenario( - 'PMM-T631 PMM-T633 PMM-T1251 Changing rows per page resets view to 1 page @ia', + 'PMM-T631 PMM-T633 PMM-T1251 Changing rows per page resets view to 1 page @fb-alerting', async ({ I, iaCommon, templatesAPI, }) => { diff --git a/tests/ia/ruleTemplates_test.js b/tests/ia/ruleTemplates_test.js index 8d96cc714..56eb1f9a7 100644 --- a/tests/ia/ruleTemplates_test.js +++ b/tests/ia/ruleTemplates_test.js @@ -38,7 +38,7 @@ Before(async ({ templatesAPI }) => { // TODO: Unskip after we bring back built-in templates Scenario.skip( - 'PMM-T510 Verify built-in rule templates are non-editable @ia @grafana-pr', + 'PMM-T510 Verify built-in rule templates are non-editable @fb-alerting @grafana-pr', async ({ I, ruleTemplatesPage }) => { const editButton = ruleTemplatesPage.buttons .editButtonBySource(ruleTemplatesPage.templateSources.builtin); @@ -53,7 +53,7 @@ Scenario.skip( ); Scenario( - 'Verify rule templates list elements @ia @grafana-pr', + 'Verify rule templates list elements @fb-alerting @grafana-pr', async ({ I, ruleTemplatesPage, templatesAPI }) => { const path = ruleTemplatesPage.ruleTemplate.paths.yaml; @@ -79,7 +79,7 @@ Scenario( ); Scenario( - 'Add rule template modal elements @ia @grafana-pr', + 'Add rule template modal elements @fb-alerting @grafana-pr', async ({ I, ruleTemplatesPage }) => { ruleTemplatesPage.openRuleTemplatesTab(); I.click(ruleTemplatesPage.buttons.openAddTemplateModal); @@ -94,7 +94,7 @@ Scenario( // nightly candidate Data(units) .Scenario( - 'PMM-T500 PMM-T595 PMM-T596 Add rule templates with different units, empty range @ia', + 'PMM-T500 PMM-T595 PMM-T596 Add rule templates with different units, empty range @fb-alerting', async ({ I, ruleTemplatesPage, templatesAPI, current, }) => { @@ -130,7 +130,7 @@ Data(units) Data(templates) .Scenario( - 'PMM-T482 PMM-T499 PMM-T766 PMM-T758 PMM-T766 PMM-T767 PMM-T931 Upload rule templates @ia', + 'PMM-T482 PMM-T499 PMM-T766 PMM-T758 PMM-T766 PMM-T767 PMM-T931 Upload rule templates @fb-alerting', async ({ I, ruleTemplatesPage, current }) => { const { path } = current; const validFile = !current.error; @@ -157,7 +157,7 @@ Data(templates) ); Scenario( - '@PMM-T1785 Bulk rule templates upload @ia', + '@PMM-T1785 Bulk rule templates upload @fb-alerting', async ({ I, ruleTemplatesPage }) => { const path = 'tests/ia/templates/multiple-templates.yml'; const templates = await ruleTemplatesPage.ruleTemplate.parseTemplates(path); @@ -182,7 +182,7 @@ Scenario( ); Scenario( - '@PMM-T1786 Edit bulk uploaded rule template @ia', + '@PMM-T1786 Edit bulk uploaded rule template @fb-alerting', async ({ I, ruleTemplatesPage, templatesAPI }) => { const path = 'tests/ia/templates/multiple-templates.yml'; const templates = await ruleTemplatesPage.ruleTemplate.parseTemplates(path); @@ -219,7 +219,7 @@ Scenario( ); Scenario( - '@PMM-T1787 Delete bulk uploaded rule template @ia', + '@PMM-T1787 Delete bulk uploaded rule template @fb-alerting', async ({ I, ruleTemplatesPage, templatesAPI }) => { const path = 'tests/ia/templates/multiple-templates.yml'; const templates = await ruleTemplatesPage.ruleTemplate.parseTemplates(path); @@ -251,7 +251,7 @@ Scenario( ); Scenario( - 'PMM-T501 Upload duplicate rule template @ia @grafana-pr', + 'PMM-T501 Upload duplicate rule template @fb-alerting @grafana-pr', async ({ I, ruleTemplatesPage, templatesAPI }) => { const path = ruleTemplatesPage.ruleTemplate.paths.yaml; const [, , id] = await ruleTemplatesPage.ruleTemplate.templateNameAndContent(path); @@ -269,7 +269,7 @@ Scenario( ); Scenario( - 'PMM-T483 PMM-T699 Verify user can edit UI-created IA rule template @ia @grafana-pr @alerting-fb', + 'PMM-T483 PMM-T699 Verify user can edit UI-created IA rule template @grafana-pr @fb-alerting', async ({ I, ruleTemplatesPage, templatesAPI }) => { const path = ruleTemplatesPage.ruleTemplate.paths.yaml; const [templateName, fileContent, id] = await ruleTemplatesPage.ruleTemplate @@ -300,7 +300,7 @@ Scenario( ); Scenario( - 'PMM-T562 Verify user can delete User-defined (UI) rule templates @ia @grafana-pr @alerting-fb', + 'PMM-T562 Verify user can delete User-defined (UI) rule templates @grafana-pr @fb-alerting', async ({ I, ruleTemplatesPage, templatesAPI }) => { const path = ruleTemplatesPage.ruleTemplate.paths.yaml; const [templateName] = await ruleTemplatesPage.ruleTemplate @@ -329,7 +329,7 @@ Scenario( ); Scenario( - 'PMM-T884 Verify templates from Percona (SAAS) cannot be deleted or edited @ia', + 'PMM-T884 Verify templates from Percona (SAAS) cannot be deleted or edited @fb-alerting', async ({ I, ruleTemplatesPage }) => { const saasDeleteButton = ruleTemplatesPage.buttons .deleteButtonBySource(ruleTemplatesPage.templateSources.saas); @@ -344,7 +344,7 @@ Scenario( ); Scenario( - 'PMM-T553 Verify rule template can be deleted if there is a rule based on it @ia', + 'PMM-T553 Verify rule template can be deleted if there is a rule based on it @fb-alerting', async ({ I, ruleTemplatesPage, templatesAPI, rulesAPI, }) => { @@ -366,7 +366,7 @@ Scenario( ); Scenario( - 'PMM-T825 PMM-T821 Verify User can add Alert rule template in the file system @not-ovf @ia', + 'PMM-T825 PMM-T821 Verify User can add Alert rule template in the file system @not-ovf @fb-alerting', async ({ I, ruleTemplatesPage }) => { const editButton = ruleTemplatesPage.buttons .editButtonBySource(ruleTemplatesPage.templateSources.file); @@ -388,7 +388,7 @@ Scenario( ); Scenario( - 'PMM-T1126 - Verify there are no Templates from Percona if Telemetry is disabled @ia', + 'PMM-T1126 - Verify there are no Templates from Percona if Telemetry is disabled @fb-alerting', async ({ I, settingsAPI, ruleTemplatesPage }) => { const editButton = ruleTemplatesPage.buttons .editButtonBySource(ruleTemplatesPage.templateSources.saas); @@ -408,7 +408,7 @@ Scenario( ); Scenario( - '@PMM-T1514 Verify that alert rule templates has only 1 exit button @ia', + '@PMM-T1514 Verify that alert rule templates has only 1 exit button @fb-alerting', async ({ I, ruleTemplatesPage, alertRulesPage }) => { ruleTemplatesPage.openRuleTemplatesTab(); ruleTemplatesPage.openAddDialog(await I.grabTextFrom(ruleTemplatesPage.elements.templateName)); diff --git a/tests/serverLogs_test.js b/tests/serverLogs_test.js index 4117eee02..cfa99ebab 100644 --- a/tests/serverLogs_test.js +++ b/tests/serverLogs_test.js @@ -24,23 +24,23 @@ BeforeSuite(async ({ I, locationsAPI }) => { } }); -// @settings-fb tag added in order to execute these tests on FB +// @fb-settings tag added in order to execute these tests on FB -Scenario('PMM-T1902 Verify no line_count parameter when downloading logs @settings-fb', async ({ I }) => { +Scenario('PMM-T1902 Verify no line_count parameter when downloading logs @fb-settings', async ({ I }) => { const outputPath = await I.downloadZipFile(`${baseUrl}/logs.zip`, filename); const actualLineCount = I.getFileLineCount(outputPath, fileNameToCheck); assert.ok(actualLineCount === 50001, `File ${fileNameToCheck} has ${actualLineCount} lines, but expected 50001`); }); -Scenario('PMM-T1903 Verify line_count=10 parameter when downloading logs @settings-fb', async ({ I }) => { +Scenario('PMM-T1903 Verify line_count=10 parameter when downloading logs @fb-settings', async ({ I }) => { const outputPath = await I.downloadZipFile(`${baseUrl}/logs.zip?line-count=10`, filename); const actualLineCount = I.getFileLineCount(outputPath, fileNameToCheck); assert.ok(actualLineCount === 11, `File ${fileNameToCheck} has ${actualLineCount} lines, but expected 11`); }); -Scenario('PMM-T1904 Verify line_count=-1 parameter when downloading logs @settings-fb', async ({ I }) => { +Scenario('PMM-T1904 Verify line_count=-1 parameter when downloading logs @fb-settings', async ({ I }) => { const outputPath = await I.downloadZipFile(`${baseUrl}/logs.zip?line-count=-1`, filename); const actualLineCount = I.getFileLineCount(outputPath, fileNameToCheck); diff --git a/tests/verifyRemoteInstances_test.js b/tests/verifyRemoteInstances_test.js index 969a4cd1b..d82379002 100644 --- a/tests/verifyRemoteInstances_test.js +++ b/tests/verifyRemoteInstances_test.js @@ -62,14 +62,14 @@ Before(async ({ I }) => { }); // The test relies on --setup-external-service flag setup from pmm-framework -Scenario.skip('@PMM-T1700 - External service name is properly displayed @instances @instances-fb', async ({ I, pmmInventoryPage }) => { +Scenario.skip('@PMM-T1700 - External service name is properly displayed @instances @fb-instances', async ({ I, pmmInventoryPage }) => { I.amOnPage(pmmInventoryPage.url); pmmInventoryPage.changeRowsPerPage(100); I.waitForVisible(pmmInventoryPage.fields.serviceRow('redis_external'), 30); }); Scenario( - '@PMM-T588 - Verify adding external exporter service via UI @instances @instances-fb', + '@PMM-T588 - Verify adding external exporter service via UI @instances @fb-instances', async ({ I, remoteInstancesPage, pmmInventoryPage }) => { I.amOnPage(remoteInstancesPage.url); remoteInstancesPage.waitUntilRemoteInstancesPageLoaded(); @@ -85,7 +85,7 @@ Scenario( ).retry(0); Data(instances).Scenario( - 'PMM-T898 Verify Remote Instance Addition [critical] @instances @instances-fb', + 'PMM-T898 Verify Remote Instance Addition [critical] @instances @fb-instances', async ({ I, remoteInstancesPage, current }) => { const serviceName = remoteInstancesHelper.services[current.name]; @@ -125,7 +125,7 @@ Scenario( ); Data(instances).Scenario( - 'Verify Remote Instance has Status Running [critical] @instances @instances-fb', + 'Verify Remote Instance has Status Running [critical] @instances @fb-instances', async ({ I, pmmInventoryPage, current, }) => { @@ -187,7 +187,7 @@ Scenario( ); Scenario( - '@PMM-T635 - Verify Adding HAProxy service via UI @instances @instances-fb', + '@PMM-T635 - Verify Adding HAProxy service via UI @instances @fb-instances', async ({ I, remoteInstancesPage, pmmInventoryPage, }) => { @@ -285,7 +285,7 @@ Data(dashboardCheck).Scenario( ).retry(2); Data(qanFilters).Scenario( - 'PMM-T854 - Verify QAN after remote instance is added @instances @instances-fb', + 'PMM-T854 - Verify QAN after remote instance is added @instances @fb-instances', async ({ I, qanOverview, qanFilters, qanPage, current, }) => { @@ -300,7 +300,7 @@ Data(qanFilters).Scenario( ).retry(2); Data(metrics).Scenario( - 'PMM-T743 Check metrics from exporters are hitting PMM Server @instances @instances-fb', + 'PMM-T743 Check metrics from exporters are hitting PMM Server @instances @fb-instances', async ({ grafanaAPI, current }) => { await grafanaAPI.waitForMetric(current.metricName, { type: 'service_name', value: current.serviceName }, 10); },