Merge remote-tracking branch 'origin/main' into chrislample/sc-20570/support-test-retries

Author: clample

Diff for: packages/cli/e2e/__tests__/fixtures/retry-project/src/__checks__/group.check.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-new */
 import { CheckGroup, BrowserCheck } from 'checkly/constructs'
 
 const group = new CheckGroup('check-group-1', {

Diff for: packages/cli/src/commands/trigger.ts

@@ -7,7 +7,13 @@ import { loadChecklyConfig } from '../services/checkly-config-loader'
 import { splitConfigFilePath, getEnvs, getGitInformation, getCiInformation } from '../services/util'
 import type { Region } from '..'
 import TriggerRunner, { NoMatchingChecksError } from '../services/trigger-runner'
-import { RunLocation, Events, PrivateRunLocation, SequenceId } from '../services/abstract-check-runner'
+import {
+  RunLocation,
+  Events,
+  PrivateRunLocation,
+  SequenceId,
+  DEFAULT_CHECK_RUN_TIMEOUT_SECONDS,
+} from '../services/abstract-check-runner'
 import config from '../services/config'
 import { createReporters, ReporterType } from '../reporters/reporter'
 import { printLn } from '../reporters/util'
@@ -44,7 +50,7 @@ export default class Trigger extends AuthCommand {
       description: 'The Checkly CLI config filename.',
     }),
     timeout: Flags.integer({
-      default: 240,
+      default: DEFAULT_CHECK_RUN_TIMEOUT_SECONDS,
       description: 'A timeout (in seconds) to wait for checks to complete.',
     }),
     verbose: Flags.boolean({

Diff for: packages/cli/src/services/abstract-check-runner.ts

@@ -35,7 +35,7 @@ export type RunLocation = PublicRunLocation | PrivateRunLocation
 export type CheckRunId = string
 export type SequenceId = string
 
-export const DEFAULT_CHECK_RUN_TIMEOUT_SECONDS = 300
+export const DEFAULT_CHECK_RUN_TIMEOUT_SECONDS = 600
 
 const DEFAULT_SCHEDULING_DELAY_EXCEEDED_MS = 20000