Skip to content

Commit

Permalink
PMM-13733: PMM Migration v2 (#927)
Browse files Browse the repository at this point in the history
* Pmm 7 pmm migration v2 (#926)

* PMM-7: debug

* PMM-7: adds settings and dashboard tests

* PMM-13733: Log job name

* PMM-13733: fix test

* PMM-13733: fix test

* PMM-13733: remove pmm qa network
  • Loading branch information
peterSirotnak authored Feb 13, 2025
1 parent 4c5aef8 commit 85ae5a9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tests/qa-integration/pmm_psmdb_integration_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ Scenario.skip(
await dashboardPage.expandEachDashboardRow();
adminPage.performPageUp(5);
await dashboardPage.verifyThereAreNoGraphsWithNA();
await dashboardPage.verifyThereAreNoGraphsWithoutData(1);
await dashboardPage.verifyThereAreNoGraphsWithoutData(3);
},
).retry(1);
).retry(2);

Scenario.skip(
'Verify QAN after MongoDB Instances is added @pmm-psmdb-replica-integration @not-ui-pipeline',
Expand Down
6 changes: 3 additions & 3 deletions tests/upgradePMM_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Scenario(

Scenario(
'PMM-T391 PMM-T1818 Verify user is able to create and set custom home dashboard'
+ ' @pre-upgrade @ovf-upgrade @ami-upgrade @pmm-upgrade',
+ ' @pre-upgrade @ovf-upgrade @ami-upgrade @pmm-upgrade @pmm-pre-migration',
async ({
I, grafanaAPI, dashboardPage, searchDashboardsModal,
}) => {
Expand All @@ -164,7 +164,7 @@ Scenario(
let additionalPanel = null;

// Panels Library is present from 2.27.0
if (versionMinor > 26) {
if (versionMinor > 26 && process.env.JOB_NAME !== 'pmm3-migration-tests') {
const libResp = await grafanaAPI.savePanelToLibrary('Lib Panel', folder.id);
const libPanel = libResp.result.model;

Expand All @@ -187,7 +187,7 @@ Scenario(
).retry(0);

Scenario(
'Verify user is able to set custom Settings like Data_retention, Resolution @pre-upgrade @ovf-upgrade @ami-upgrade @pmm-upgrade',
'Verify user is able to set custom Settings like Data_retention, Resolution @pre-upgrade @ovf-upgrade @ami-upgrade @pmm-upgrade @pmm-pre-migration',
async ({ settingsAPI, I }) => {
const body = {
telemetry_enabled: true,
Expand Down

0 comments on commit 85ae5a9

Please sign in to comment.