EVEREST-1542 - Extend upgrade tests (#956)

* EVEREST-1542 - Modify upgrade test * Create functions for getting and updating DB cluster with API * Fix function naming * Update upgrade/post-upgrade.e2e.ts test * chore: lint/format --------- Co-authored-by: tplavcic <[email protected]> Co-authored-by: Fábio Silva <[email protected]>
percona · Dec 22, 2024 · 75d5bda · 75d5bda
1 parent c4374a5
commit 75d5bda
Show file tree

Hide file tree

Showing 12 changed files with 437 additions and 153 deletions.
diff --git a/ui/apps/everest/.e2e/constants.ts b/ui/apps/everest/.e2e/constants.ts
@@ -23,6 +23,7 @@ const minute = 60 * second;
 
 export enum TIMEOUTS {
   TenSeconds = 10 * second,
+  FifteenSeconds = 15 * second,
   ThirtySeconds = 30 * second,
   OneMinute = minute,
   ThreeMinutes = 3 * minute,

diff --git a/ui/apps/everest/.e2e/playwright.config.ts b/ui/apps/everest/.e2e/playwright.config.ts
@@ -117,6 +117,7 @@ export default defineConfig({
         channel: 'chrome',
         storageState: STORAGE_STATE_FILE,
         video: 'retain-on-failure',
+        actionTimeout: 10000,
       },
       testDir: 'upgrade',
       dependencies: ['setup'],

diff --git a/ui/apps/everest/.e2e/release/demand-backup.e2e.ts b/ui/apps/everest/.e2e/release/demand-backup.e2e.ts
@@ -35,13 +35,13 @@ import {
   waitForDelete,
   findRowAndClickActions,
 } from '@e2e/utils/table';
-import { checkError } from '@e2e/utils/generic';
 import {
   deleteMonitoringInstance,
   listMonitoringInstances,
 } from '@e2e/utils/monitoring-instance';
 import { clickOnDemandBackup } from '@e2e/pr/db-cluster-details/utils';
 import { prepareTestDB, dropTestDB, queryTestDB } from '@e2e/utils/db-cmd-line';
+import { getDbClusterAPI } from '@e2e/utils/db-cluster';
 
 const {
   MONITORING_URL,
@@ -181,25 +181,13 @@ test.describe.configure({ retries: 0 });
         });
 
         await test.step('Check db cluster k8s object options', async () => {
-          const response = await request.get(
-            `/v1/namespaces/${namespace}/database-clusters`,
-            {
-              headers: {
-                Authorization: `Bearer ${token}`,
-              },
-            }
-          );
-
-          await checkError(response);
-
-          // TODO: replace with correct payload typings from GET DB Clusters
-          const { items: clusters } = await response.json();
-
-          const addedCluster = clusters.find(
-            (cluster) => cluster.metadata.name === clusterName
+          const addedCluster = await getDbClusterAPI(
+            clusterName,
+            EVEREST_CI_NAMESPACES.EVEREST_UI,
+            request,
+            token
           );
 
-          expect(addedCluster).not.toBeUndefined();
           expect(addedCluster?.spec.engine.type).toBe(db);
           expect(addedCluster?.spec.engine.replicas).toBe(size);
           expect(['600m', '0.6']).toContain(

diff --git a/ui/apps/everest/.e2e/release/init-deploy.e2e.ts b/ui/apps/everest/.e2e/release/init-deploy.e2e.ts
@@ -32,11 +32,11 @@ import {
 } from '@e2e/utils/db-wizard';
 import { EVEREST_CI_NAMESPACES } from '@e2e/constants';
 import { waitForStatus, waitForDelete } from '@e2e/utils/table';
-import { checkError } from '@e2e/utils/generic';
 import {
   deleteMonitoringInstance,
   listMonitoringInstances,
 } from '@e2e/utils/monitoring-instance';
+import { getDbClusterAPI } from '@e2e/utils/db-cluster';
 
 const {
   MONITORING_URL,
@@ -183,24 +183,13 @@ test.describe.configure({ retries: 0 });
         });
 
         await test.step('Check db cluster k8s object options', async () => {
-          const response = await request.get(
-            `/v1/namespaces/${namespace}/database-clusters`,
-            {
-              headers: {
-                Authorization: `Bearer ${token}`,
-              },
-            }
-          );
-          await checkError(response);
-
-          // TODO: replace with correct payload typings from GET DB Clusters
-          const { items: clusters } = await response.json();
-
-          const addedCluster = clusters.find(
-            (cluster) => cluster.metadata.name === clusterName
+          const addedCluster = await getDbClusterAPI(
+            clusterName,
+            EVEREST_CI_NAMESPACES.EVEREST_UI,
+            request,
+            token
           );
 
-          expect(addedCluster).not.toBeUndefined();
           expect(addedCluster?.spec.engine.type).toBe(db);
           expect(addedCluster?.spec.engine.replicas).toBe(size);
           expect(['600m', '0.6']).toContain(

diff --git a/ui/apps/everest/.e2e/release/pitr.e2e.ts b/ui/apps/everest/.e2e/release/pitr.e2e.ts
@@ -36,7 +36,6 @@ import {
   waitForDelete,
   findRowAndClickActions,
 } from '@e2e/utils/table';
-import { checkError } from '@e2e/utils/generic';
 import {
   deleteMonitoringInstance,
   listMonitoringInstances,
@@ -50,6 +49,7 @@ import {
   pgInsertDummyTestDB,
 } from '@e2e/utils/db-cmd-line';
 import { addFirstScheduleInDBWizard } from '@e2e/pr/db-cluster/db-wizard/db-wizard-utils';
+import { getDbClusterAPI, updateDbClusterAPI } from '@e2e/utils/db-cluster';
 
 const {
   MONITORING_URL,
@@ -253,45 +253,32 @@ test.describe.configure({ retries: 0 });
           if (db !== 'psmdb') {
             return;
           }
-          let psmdbCluster = await request.get(
-            `/v1/namespaces/${namespace}/database-clusters/${clusterName}`
-          );
-
-          await checkError(psmdbCluster);
-          const psmdbPayload = await psmdbCluster.json();
-
-          psmdbPayload.spec.backup.pitr.uploadIntervalSec = 60;
 
-          const updatedPSMDBCluster = await request.put(
-            `/v1/namespaces/${namespace}/database-clusters/${clusterName}`,
-            {
-              data: psmdbPayload,
-            }
+          const psmdbCluster = await getDbClusterAPI(
+            clusterName,
+            EVEREST_CI_NAMESPACES.EVEREST_UI,
+            request,
+            token
+          );
+          psmdbCluster.spec.backup.pitr.uploadIntervalSec = 60;
+          await updateDbClusterAPI(
+            clusterName,
+            EVEREST_CI_NAMESPACES.EVEREST_UI,
+            psmdbCluster,
+            request,
+            token
           );
-
-          await checkError(updatedPSMDBCluster);
         });
 
         await test.step('Check db cluster k8s object options', async () => {
-          const response = await request.get(
-            `/v1/namespaces/${namespace}/database-clusters`,
-            {
-              headers: {
-                Authorization: `Bearer ${token}`,
-              },
-            }
-          );
-          await checkError(response);
-
-          // TODO: replace with correct payload typings from GET DB Clusters
-          const { items: clusters } = await response.json();
-
-          const addedCluster = clusters.find(
-            (cluster) => cluster.metadata.name === clusterName
+          const addedCluster = await getDbClusterAPI(
+            clusterName,
+            EVEREST_CI_NAMESPACES.EVEREST_UI,
+            request,
+            token
           );
 
           expect(addedCluster?.spec.backup.pitr.enabled).toBe(true);
-          expect(addedCluster).not.toBeUndefined();
           expect(addedCluster?.spec.engine.type).toBe(db);
           expect(addedCluster?.spec.engine.replicas).toBe(size);
           expect(['600m', '0.6']).toContain(

diff --git a/ui/apps/everest/.e2e/release/scheduled-backup.e2e.ts b/ui/apps/everest/.e2e/release/scheduled-backup.e2e.ts
@@ -39,13 +39,13 @@ import {
   waitForDelete,
   findRowAndClickActions,
 } from '@e2e/utils/table';
-import { checkError } from '@e2e/utils/generic';
 import {
   deleteMonitoringInstance,
   listMonitoringInstances,
 } from '@e2e/utils/monitoring-instance';
 import { clickCreateSchedule } from '@e2e/pr/db-cluster-details/utils';
 import { prepareTestDB, dropTestDB, queryTestDB } from '@e2e/utils/db-cmd-line';
+import { getDbClusterAPI } from '@e2e/utils/db-cluster';
 
 const {
   MONITORING_URL,
@@ -188,25 +188,13 @@ function getNextScheduleMinute(incrementMinutes: number): string {
         });
 
         await test.step('Check db cluster k8s object options', async () => {
-          const response = await request.get(
-            `/v1/namespaces/${namespace}/database-clusters`,
-            {
-              headers: {
-                Authorization: `Bearer ${token}`,
-              },
-            }
-          );
-
-          await checkError(response);
-
-          // TODO: replace with correct payload typings from GET DB Clusters
-          const { items: clusters } = await response.json();
-
-          const addedCluster = clusters.find(
-            (cluster) => cluster.metadata.name === clusterName
+          const addedCluster = await getDbClusterAPI(
+            clusterName,
+            EVEREST_CI_NAMESPACES.EVEREST_UI,
+            request,
+            token
           );
 
-          expect(addedCluster).not.toBeUndefined();
           expect(addedCluster?.spec.engine.type).toBe(db);
           expect(addedCluster?.spec.engine.replicas).toBe(size);
           expect(['600m', '0.6']).toContain(