Fine tune e2e running on github actions

Checkmk · Sep 11, 2024 · 8846bbd · 8846bbd
1 parent 59e22a5
commit 8846bbd
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -128,9 +128,11 @@ jobs:
           docker compose rm -f
           docker compose up --exit-code-from=playwright --pull always
         working-directory: tests/
+        env:
+          CI: true
 
       - name: upload playwright artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright

diff --git a/playwright.config.ts b/playwright.config.ts
@@ -6,8 +6,8 @@ export default defineConfig<PluginOptions>({
   outputDir: './tests/results',
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  workers: 1,
+  retries: process.env.CI ? 3 : 0,
+  workers: 2,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'list',
   use: {

diff --git a/tests/checkmk-docker-hooks/post-create/configure_checkmk.sh b/tests/checkmk-docker-hooks/post-create/configure_checkmk.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+su - cmk -c "/usr/bin/env bash" << __EOF__
+echo abskjfdalkdhjbld | cmk-passwd cmkadmin -i
+echo "Admin password set"
+
+omd stop
+omd config set MKEVENTD off
+omd config set AGENT_RECEIVER off
+omd config set LIVEPROXYD off
+omd config set TRACE_SEND off
+omd config set TRACE_RECEIVE off
+omd start
+echo "Event console, agent receiver, liveproxy, and trace disabled"
+__EOF__
diff --git a/tests/checkmk-docker-hooks/post-create/set-admin-password.sh b/tests/checkmk-docker-hooks/post-create/set-admin-password.sh
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -33,17 +33,19 @@ services:
       context: ../
       dockerfile: tests/Dockerfile
     environment:
-      CMK_SITE: cmk
-      CMK_ADMIN: cmkadmin
-      CMK_AUTOMATION: automation
-      CMK_PASSWORD: abskjfdalkdhjbld
-      PLAYWRIGHT_TO_CHECKMK_URL: http://checkmk:5000/cmk/
-      PLAYWRIGHT_TO_GRAFANA_URL: http://grafana:3000/
-      GRAFANA_USER: admin
-      GRAFANA_PASSWORD: password
-      GRAFANA_TO_CHECKMK_USER: automation
-      GRAFANA_TO_CHECKMK_PASSWORD: abskjfdalkdhjbld
-      GRAFANA_TO_CHECKMK_URL: http://checkmk:5000/cmk/
+      - CMK_SITE=cmk
+      - CMK_ADMIN=cmkadmin
+      - CMK_AUTOMATION=automation
+      - CMK_PASSWORD=abskjfdalkdhjbld
+      - PLAYWRIGHT_TO_CHECKMK_URL=http://checkmk:5000/cmk/
+      - PLAYWRIGHT_TO_GRAFANA_URL=http://grafana:3000/
+      - GRAFANA_USER=admin
+      - GRAFANA_PASSWORD=password
+      - GRAFANA_TO_CHECKMK_USER=automation
+      - GRAFANA_TO_CHECKMK_PASSWORD=abskjfdalkdhjbld
+      - GRAFANA_TO_CHECKMK_URL=http://checkmk:5000/cmk/
+      - CI
+
     extra_hosts:
       - checkmk.local:host-gateway
     volumes:

diff --git a/tests/e2e/config.ts b/tests/e2e/config.ts
@@ -2,11 +2,9 @@ import dotenv from 'dotenv';
 
 dotenv.config();
 
-const site = process.env.CMK_SITE;
-
 const cfg = {
   //Checkmk
-  site: site,
+  site: process.env.CMK_SITE,
   cmkUser: process.env.CMK_ADMIN,
   cmkPassword: process.env.CMK_PASSWORD,
   automationUser: process.env.CMK_AUTOMATION,

diff --git a/tests/e2e/models/DashboardPage.ts b/tests/e2e/models/DashboardPage.ts
@@ -3,7 +3,7 @@ import { type Page, expect } from '@playwright/test';
 import current_config from '../config';
 import { FilterTypes, GRAFANA_SELECTORS, GRAFANA_TEXT, GraphTypes } from '../constants';
 
-const CUSTOM_TIMEOUT = 40000;
+const CUSTOM_TIMEOUT = 30000;
 
 export class DashboardPage {
   readonly page: Page;

diff --git a/tests/e2e/tests/e2e.test.ts b/tests/e2e/tests/e2e.test.ts
@@ -32,6 +32,7 @@ test.describe('E2E tests', () => {
   });
 
   test.describe('Commercial editions tests', () => {
+    test.slow();
     test('time-usage panel by service (single host)', async ({ page }) => {
       const dashboardPage = new DashboardPage(page);
       await dashboardPage.selectDatasource(CMK_EDITION.CEE);
@@ -94,7 +95,7 @@ test.describe('E2E tests', () => {
       await dashboardPage.addFilter(FilterTypes.HOSTNAME_REGEX);
       await dashboardPage.filterByHostnameRegex('localhost_grafana[0-9]+');
 
-      await expect(page.locator(GRAFANA_SELECTORS.SPINNER).first()).not.toBeVisible();
+      await dashboardPage.expectSpinners(false);
 
       await dashboardPage.selectPredefinedGraphType(GraphTypes.RAM_USAGE);
 
@@ -213,6 +214,7 @@ test.describe('E2E tests', () => {
   });
 
   test.describe('Raw edition tests', () => {
+    test.slow();
     test('time-usage panel by service (Single host)', async ({ page }, testInfo) => {
       const dashboardPage = new DashboardPage(page);
       await dashboardPage.selectDatasource(CMK_EDITION.CRE);