Skip to content

Commit 0cd4b7c

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents d182553 + bab5540 commit 0cd4b7c

File tree

117 files changed

+3795
-6889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3795
-6889
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,10 @@ tasks:
432432
vars:
433433
compass_distribution: <%= distribution %>
434434
- func: spawn-signing-server
435-
retry_on_failure: true
436435
- func: package
437436
vars:
438437
debug: 'hadron*,mongo*,compass*,electron*,sign*'
439438
compass_distribution: <%= distribution %>
440-
retry_on_failure: true
441439
- func: verify-artifacts
442440
- func: save-all-artifacts
443441
vars:

.evergreen/buildvariants-and-tasks.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,10 @@ tasks:
438438
vars:
439439
compass_distribution: compass
440440
- func: spawn-signing-server
441-
retry_on_failure: true
442441
- func: package
443442
vars:
444443
debug: hadron*,mongo*,compass*,electron*,sign*
445444
compass_distribution: compass
446-
retry_on_failure: true
447445
- func: verify-artifacts
448446
- func: save-all-artifacts
449447
vars:
@@ -463,12 +461,10 @@ tasks:
463461
vars:
464462
compass_distribution: compass-isolated
465463
- func: spawn-signing-server
466-
retry_on_failure: true
467464
- func: package
468465
vars:
469466
debug: hadron*,mongo*,compass*,electron*,sign*
470467
compass_distribution: compass-isolated
471-
retry_on_failure: true
472468
- func: verify-artifacts
473469
- func: save-all-artifacts
474470
vars:
@@ -488,12 +484,10 @@ tasks:
488484
vars:
489485
compass_distribution: compass-readonly
490486
- func: spawn-signing-server
491-
retry_on_failure: true
492487
- func: package
493488
vars:
494489
debug: hadron*,mongo*,compass*,electron*,sign*
495490
compass_distribution: compass-readonly
496-
retry_on_failure: true
497491
- func: verify-artifacts
498492
- func: save-all-artifacts
499493
vars:

.evergreen/functions.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ functions:
306306
spawn-signing-server:
307307
# spawn
308308
- command: host.create
309+
retry_on_failure: true
309310
type: setup
310311
params:
311312
provider: ec2
@@ -314,13 +315,15 @@ functions:
314315
- sg-097bff6dd0d1d31d0 # Magic string that's needed for SSH'ing.
315316
# write host info (this file will be read by signingtool when connection to ssh server)
316317
- command: host.list
318+
retry_on_failure: true
317319
params:
318320
num_hosts: 1
319321
path: spawned_hosts.json
320322
timeout_seconds: 1200
321323
wait: true
322324
# copy ssh key (this key will be used to connect to ssh server)
323325
- command: shell.exec
326+
retry_on_failure: true
324327
params:
325328
working_dir: src
326329
shell: bash
@@ -332,6 +335,7 @@ functions:
332335
333336
# wait for host to be ready
334337
- command: shell.exec
338+
retry_on_failure: true
335339
params:
336340
exec_as_string: true
337341
shell: bash
@@ -379,11 +383,13 @@ functions:
379383
EOL
380384
# Update the expansions
381385
- command: expansions.update
386+
retry_on_failure: true
382387
params:
383388
file: signing_host_info.yml
384389

385390
package:
386391
- command: shell.exec
392+
retry_on_failure: true
387393
params:
388394
working_dir: src
389395
shell: bash
@@ -402,10 +408,12 @@ functions:
402408
eval $(.evergreen/print-compass-env.sh)
403409
cd packages/compass && npm run prepackage-compass
404410
- command: ec2.assume_role
411+
retry_on_failure: true
405412
display_name: Assume IAM role with permissions to pull Kondukto API token
406413
params:
407414
role_arn: ${kondukto_role_arn}
408415
- command: shell.exec
416+
retry_on_failure: true
409417
params:
410418
working_dir: src
411419
shell: bash
@@ -426,6 +434,7 @@ functions:
426434
427435
bash ".evergreen/retry-with-backoff.sh" .evergreen/create-sbom.sh
428436
- command: shell.exec
437+
retry_on_failure: true
429438
params:
430439
working_dir: src
431440
shell: bash

.github/workflows/test-installers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
include:
7575
# MacOS
7676
- package: osx_dmg
77-
runs-on: macos-13
77+
runs-on: macos-15-intel
7878
arch: x64
7979
hadron-platform: darwin
8080
- package: osx_zip
@@ -181,7 +181,7 @@ jobs:
181181
DEBUG: compass:smoketests:*,compass-e2e-tests:*
182182
# Similar to total task timeout, setting these higher than the default
183183
# value to account for very slow windows machines
184-
COMPASS_E2E_MOCHA_TIMEOUT: 720000 # 12min
184+
COMPASS_E2E_MOCHA_TIMEOUT: 1200000 # 20min
185185
COMPASS_E2E_WEBDRIVER_WAITFOR_TIMEOUT: 600000 # 10min
186186
steps:
187187
- name: Checkout

.github/workflows/update-dependencies.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
needs: configure_matrix
4747
env:
4848
UPDATE_BRANCH_NAME: ci/update-${{ matrix.group_name }}
49+
continue-on-error: true
4950
strategy:
5051
matrix:
5152
group_name: ${{ fromJSON(needs.configure_matrix.outputs.group_name) }}

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,4 @@ Shun Miyazawa <[email protected]>
119119
120120
carolynmcca <[email protected]>
121121
Case Kramer <[email protected]>
122+
Jose Lopez <[email protected]>

0 commit comments

Comments
 (0)