Merge pull request #51 from modern-sapien/multi-step-updates

Multi step updates
modern-sapien · Jul 17, 2024 · fca3ff6 · fca3ff6
2 parents 6f0464e + 1a63c22
commit fca3ff6
Show file tree

Hide file tree

Showing 11 changed files with 238 additions and 251 deletions.
diff --git a/next-webstore/.gitignore b/next-webstore/.gitignore
@@ -2,7 +2,7 @@
 
 # test resource
 /tests/*.spec.ts-snapshots
-/tests/e2e/*.spec.ts-snapshots
+/tests/e2e/*-snapshots
 
 # dependencies
 /node_modules

diff --git a/next-webstore/checkly.config.ts b/next-webstore/checkly.config.ts
@@ -12,22 +12,23 @@ const config = defineConfig({
     runtimeId: '2024.02',
     frequency: 60,
     locations: ['us-east-1', 'eu-west-1'],
+    // privateLocations: ['private-infra'],
     tags: [`cli`],
     alertChannels: [emailChannel, slackChannel, webhookChannel],
     checkMatch: '*/**/*.check.ts',
     ignoreDirectoriesMatch: [],
     browserChecks: {
       frequency: 30,
-      testMatch: '*/tests/e2e/*.spec.ts',
+      testMatch: './tests/e2e/*.spec.ts',
     },
     multiStepChecks: {
       frequency: 30,
-      testMatch: '*/tests/multi/*.spec.ts',
+      testMatch: './tests/multi/*.spec.ts',
     }
   },
   cli: {
     runLocation: 'us-east-1',
-    // privateRunLocation: 'new-local'
+    // privateRunLocation: 'private-infra'
   },
 });
 

diff --git a/next-webstore/checks/browser.check.ts b/next-webstore/checks/browser.check.ts
@@ -1,12 +1,17 @@
-import { BrowserCheck, Frequency } from 'checkly/constructs';
+import { BrowserCheck, Frequency, RetryStrategyBuilder } from 'checkly/constructs';
 import { defaults } from '../tests/defaults';
 import { group } from './resources/group.check';
 import * as path from 'path';
 
 new BrowserCheck(`next-danube-${defaults.projectEnv}-login`, {
   name: `Next Danube ${defaults.projectEnv} login - browser`,
   group,
-  frequency: Frequency.EVERY_5M,
+  frequency: 5,
+  retryStrategy: RetryStrategyBuilder.linearStrategy({
+    baseBackoffSeconds: 5,
+    maxRetries: 1,
+    sameRegion: false,
+  }),
   code: {
     entrypoint: path.join(__dirname, '../tests/e2e/login.spec.ts'),
   },
@@ -15,9 +20,19 @@ new BrowserCheck(`next-danube-${defaults.projectEnv}-login`, {
 new BrowserCheck(`next-danube-${defaults.projectEnv}-visit`, {
   name: `Next Danube ${defaults.projectEnv} visit - browser`,
   group,
-  tags: ['tagtest'],
-  frequency: Frequency.EVERY_5M,
+  tags: ['cli'],
+  frequency: Frequency.EVERY_10M,
   code: {
     entrypoint: path.join(__dirname, '../tests/e2e/visit.spec.ts'),
   },
 });
+
+new BrowserCheck(`next-danube-${defaults.projectEnv}-otel`, {
+  name: `Next Danube ${defaults.projectEnv} otel - browser`,
+  group,
+  tags: ['cli', 'otel'],
+  frequency: Frequency.EVERY_10M,
+  code: {
+    entrypoint: path.join(__dirname, '../tests/e2e/otel.spec.ts'),
+  },
+});
diff --git a/next-webstore/checks/multi-step.check.ts b/next-webstore/checks/multi-step.check.ts
@@ -13,6 +13,6 @@ new MultiStepCheck(`next-danube-${defaults.projectEnv}-crud`, {
   group,
   frequency: Frequency.EVERY_5M,
   code: {
-    entrypoint: path.join(__dirname, '../tests/multi/multi-crud.spec.ts'),
+    entrypoint: path.join(__dirname, '../tests/multi/degraded-spacex.spec.ts'),
   },
 });
diff --git a/next-webstore/checks/resources/group.check.ts b/next-webstore/checks/resources/group.check.ts
@@ -8,11 +8,7 @@ export const group = new CheckGroup(`${defaults.projectEnv}-next-danube-group`,
   locations: ['us-east-1', 'eu-west-1'],
   tags: [`${defaults.projectEnv}`, 'cli'],
   runParallel: true,
-  retryStrategy: RetryStrategyBuilder.fixedStrategy({
-    baseBackoffSeconds: 30,
-    maxRetries: 1,
-    sameRegion: true,
-  }),
+  retryStrategy: RetryStrategyBuilder.noRetries(),
   browserChecks: {
     frequency: Frequency.EVERY_30M,
     testMatch: '*.spec.js',