Skip to content

Commit 4292c1f

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 9217440 + d687a2d commit 4292c1f

File tree

228 files changed

+10191
-12483
lines changed

Some content is hidden

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

228 files changed

+10191
-12483
lines changed

‎.evergreen.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
stepback: false
22
exec_timeout_secs: 5400
3+
foliage_should_block_merges: false
34
ignore:
45
- docs/**/*.md
56
- AUTHORS

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [
108108
];
109109
110110
const EOL_SERVER_VERSIONS = [
111-
{ name: '40x-community', version: '4.0.x' },
112-
{ name: '40x-enterprise', version: '4.0.x-enterprise' },
113-
{ name: '42x-community', version: '4.2.x' },
114-
{ name: '42x-enterprise', version: '4.2.x-enterprise' },
115111
{ name: '44x-community', version: '4.4.x' },
116112
{ name: '44x-enterprise', version: '4.4.x-enterprise' },
117113
{ name: '5x-community', version: '5.x.x' },
@@ -294,6 +290,12 @@ buildvariants:
294290
<% } %>
295291
<% } %>
296292

293+
- name: test-can-bundle-compass-web
294+
display_name: Test Can Bundle Compass Web
295+
run_on: ubuntu2004-large
296+
tasks:
297+
- name: test-can-bundle-compass-web
298+
297299
- name: test-web-sandbox-atlas-cloud
298300
display_name: Test Web Sandbox (w/ Atlas Cloud login)
299301
run_on: ubuntu2004-large
@@ -561,6 +563,19 @@ tasks:
561563
<% } %>
562564
<% } %>
563565

566+
- name: test-can-bundle-compass-web
567+
tags:
568+
- run-on-pr
569+
- assigned_to_jira_team_compass_compass
570+
- foliage_check_task_only
571+
commands:
572+
- func: prepare
573+
- func: install
574+
- func: bootstrap
575+
- func: compile-compass-web
576+
vars:
577+
debug: 'compass*,electron*,hadron*,mongo*'
578+
564579
- name: test-web-sandbox-atlas-cloud
565580
tags:
566581
- required-for-publish

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

Lines changed: 17 additions & 288 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,6 @@ buildvariants:
120120
- name: package-compass
121121
variant: package-ubuntu
122122
tasks:
123-
- name: test-server-40x-community-1
124-
- name: test-server-40x-community-2
125-
- name: test-server-40x-community-3
126-
- name: test-server-40x-enterprise-1
127-
- name: test-server-40x-enterprise-2
128-
- name: test-server-40x-enterprise-3
129-
- name: test-server-42x-community-1
130-
- name: test-server-42x-community-2
131-
- name: test-server-42x-community-3
132-
- name: test-server-42x-enterprise-1
133-
- name: test-server-42x-enterprise-2
134-
- name: test-server-42x-enterprise-3
135123
- name: test-server-44x-community-1
136124
- name: test-server-44x-community-2
137125
- name: test-server-44x-community-3
@@ -292,6 +280,11 @@ buildvariants:
292280
- name: test-web-sandbox-firefox-1
293281
- name: test-web-sandbox-firefox-2
294282
- name: test-web-sandbox-firefox-3
283+
- name: test-can-bundle-compass-web
284+
display_name: Test Can Bundle Compass Web
285+
run_on: ubuntu2004-large
286+
tasks:
287+
- name: test-can-bundle-compass-web
295288
- name: test-web-sandbox-atlas-cloud
296289
display_name: Test Web Sandbox (w/ Atlas Cloud login)
297290
run_on: ubuntu2004-large
@@ -517,282 +510,6 @@ tasks:
517510
- func: smoketest-on-github-actions
518511
vars:
519512
debug: compass-e2e-tests*,electron*,hadron*,mongo*
520-
- name: test-server-40x-community-1
521-
tags:
522-
- required-for-publish
523-
- run-on-pr
524-
commands:
525-
- func: prepare
526-
- func: install
527-
- func: bootstrap
528-
vars:
529-
scope: compass-e2e-tests
530-
- func: apply-compass-target-expansion
531-
vars:
532-
compass_distribution: compass
533-
- func: get-packaged-app
534-
vars:
535-
compass_distribution: compass
536-
- func: test-packaged-app
537-
vars:
538-
mongodb_version: 4.0.x
539-
compass_distribution: compass
540-
e2e_test_groups: 3
541-
e2e_test_group: 1
542-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
543-
- name: test-server-40x-community-2
544-
tags:
545-
- required-for-publish
546-
- run-on-pr
547-
commands:
548-
- func: prepare
549-
- func: install
550-
- func: bootstrap
551-
vars:
552-
scope: compass-e2e-tests
553-
- func: apply-compass-target-expansion
554-
vars:
555-
compass_distribution: compass
556-
- func: get-packaged-app
557-
vars:
558-
compass_distribution: compass
559-
- func: test-packaged-app
560-
vars:
561-
mongodb_version: 4.0.x
562-
compass_distribution: compass
563-
e2e_test_groups: 3
564-
e2e_test_group: 2
565-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
566-
- name: test-server-40x-community-3
567-
tags:
568-
- required-for-publish
569-
- run-on-pr
570-
commands:
571-
- func: prepare
572-
- func: install
573-
- func: bootstrap
574-
vars:
575-
scope: compass-e2e-tests
576-
- func: apply-compass-target-expansion
577-
vars:
578-
compass_distribution: compass
579-
- func: get-packaged-app
580-
vars:
581-
compass_distribution: compass
582-
- func: test-packaged-app
583-
vars:
584-
mongodb_version: 4.0.x
585-
compass_distribution: compass
586-
e2e_test_groups: 3
587-
e2e_test_group: 3
588-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
589-
- name: test-server-40x-enterprise-1
590-
tags:
591-
- required-for-publish
592-
- run-on-pr
593-
commands:
594-
- func: prepare
595-
- func: install
596-
- func: bootstrap
597-
vars:
598-
scope: compass-e2e-tests
599-
- func: apply-compass-target-expansion
600-
vars:
601-
compass_distribution: compass
602-
- func: get-packaged-app
603-
vars:
604-
compass_distribution: compass
605-
- func: test-packaged-app
606-
vars:
607-
mongodb_version: 4.0.x-enterprise
608-
compass_distribution: compass
609-
e2e_test_groups: 3
610-
e2e_test_group: 1
611-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
612-
- name: test-server-40x-enterprise-2
613-
tags:
614-
- required-for-publish
615-
- run-on-pr
616-
commands:
617-
- func: prepare
618-
- func: install
619-
- func: bootstrap
620-
vars:
621-
scope: compass-e2e-tests
622-
- func: apply-compass-target-expansion
623-
vars:
624-
compass_distribution: compass
625-
- func: get-packaged-app
626-
vars:
627-
compass_distribution: compass
628-
- func: test-packaged-app
629-
vars:
630-
mongodb_version: 4.0.x-enterprise
631-
compass_distribution: compass
632-
e2e_test_groups: 3
633-
e2e_test_group: 2
634-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
635-
- name: test-server-40x-enterprise-3
636-
tags:
637-
- required-for-publish
638-
- run-on-pr
639-
commands:
640-
- func: prepare
641-
- func: install
642-
- func: bootstrap
643-
vars:
644-
scope: compass-e2e-tests
645-
- func: apply-compass-target-expansion
646-
vars:
647-
compass_distribution: compass
648-
- func: get-packaged-app
649-
vars:
650-
compass_distribution: compass
651-
- func: test-packaged-app
652-
vars:
653-
mongodb_version: 4.0.x-enterprise
654-
compass_distribution: compass
655-
e2e_test_groups: 3
656-
e2e_test_group: 3
657-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
658-
- name: test-server-42x-community-1
659-
tags:
660-
- required-for-publish
661-
- run-on-pr
662-
commands:
663-
- func: prepare
664-
- func: install
665-
- func: bootstrap
666-
vars:
667-
scope: compass-e2e-tests
668-
- func: apply-compass-target-expansion
669-
vars:
670-
compass_distribution: compass
671-
- func: get-packaged-app
672-
vars:
673-
compass_distribution: compass
674-
- func: test-packaged-app
675-
vars:
676-
mongodb_version: 4.2.x
677-
compass_distribution: compass
678-
e2e_test_groups: 3
679-
e2e_test_group: 1
680-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
681-
- name: test-server-42x-community-2
682-
tags:
683-
- required-for-publish
684-
- run-on-pr
685-
commands:
686-
- func: prepare
687-
- func: install
688-
- func: bootstrap
689-
vars:
690-
scope: compass-e2e-tests
691-
- func: apply-compass-target-expansion
692-
vars:
693-
compass_distribution: compass
694-
- func: get-packaged-app
695-
vars:
696-
compass_distribution: compass
697-
- func: test-packaged-app
698-
vars:
699-
mongodb_version: 4.2.x
700-
compass_distribution: compass
701-
e2e_test_groups: 3
702-
e2e_test_group: 2
703-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
704-
- name: test-server-42x-community-3
705-
tags:
706-
- required-for-publish
707-
- run-on-pr
708-
commands:
709-
- func: prepare
710-
- func: install
711-
- func: bootstrap
712-
vars:
713-
scope: compass-e2e-tests
714-
- func: apply-compass-target-expansion
715-
vars:
716-
compass_distribution: compass
717-
- func: get-packaged-app
718-
vars:
719-
compass_distribution: compass
720-
- func: test-packaged-app
721-
vars:
722-
mongodb_version: 4.2.x
723-
compass_distribution: compass
724-
e2e_test_groups: 3
725-
e2e_test_group: 3
726-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
727-
- name: test-server-42x-enterprise-1
728-
tags:
729-
- required-for-publish
730-
- run-on-pr
731-
commands:
732-
- func: prepare
733-
- func: install
734-
- func: bootstrap
735-
vars:
736-
scope: compass-e2e-tests
737-
- func: apply-compass-target-expansion
738-
vars:
739-
compass_distribution: compass
740-
- func: get-packaged-app
741-
vars:
742-
compass_distribution: compass
743-
- func: test-packaged-app
744-
vars:
745-
mongodb_version: 4.2.x-enterprise
746-
compass_distribution: compass
747-
e2e_test_groups: 3
748-
e2e_test_group: 1
749-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
750-
- name: test-server-42x-enterprise-2
751-
tags:
752-
- required-for-publish
753-
- run-on-pr
754-
commands:
755-
- func: prepare
756-
- func: install
757-
- func: bootstrap
758-
vars:
759-
scope: compass-e2e-tests
760-
- func: apply-compass-target-expansion
761-
vars:
762-
compass_distribution: compass
763-
- func: get-packaged-app
764-
vars:
765-
compass_distribution: compass
766-
- func: test-packaged-app
767-
vars:
768-
mongodb_version: 4.2.x-enterprise
769-
compass_distribution: compass
770-
e2e_test_groups: 3
771-
e2e_test_group: 2
772-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
773-
- name: test-server-42x-enterprise-3
774-
tags:
775-
- required-for-publish
776-
- run-on-pr
777-
commands:
778-
- func: prepare
779-
- func: install
780-
- func: bootstrap
781-
vars:
782-
scope: compass-e2e-tests
783-
- func: apply-compass-target-expansion
784-
vars:
785-
compass_distribution: compass
786-
- func: get-packaged-app
787-
vars:
788-
compass_distribution: compass
789-
- func: test-packaged-app
790-
vars:
791-
mongodb_version: 4.2.x-enterprise
792-
compass_distribution: compass
793-
e2e_test_groups: 3
794-
e2e_test_group: 3
795-
debug: compass-e2e-tests*,electron*,hadron*,mongo*
796513
- name: test-server-44x-community-1
797514
tags:
798515
- required-for-publish
@@ -1840,6 +1557,18 @@ tasks:
18401557
e2e_test_groups: 3
18411558
e2e_test_group: 3
18421559
debug: compass-e2e-tests*,electron*,hadron*,mongo*
1560+
- name: test-can-bundle-compass-web
1561+
tags:
1562+
- run-on-pr
1563+
- assigned_to_jira_team_compass_compass
1564+
- foliage_check_task_only
1565+
commands:
1566+
- func: prepare
1567+
- func: install
1568+
- func: bootstrap
1569+
- func: compile-compass-web
1570+
vars:
1571+
debug: compass*,electron*,hadron*,mongo*
18431572
- name: test-web-sandbox-atlas-cloud
18441573
tags:
18451574
- required-for-publish

‎.evergreen/connectivity-tests/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# "bullseye" is the debian distribution that ubuntu:20.04 is based on
2-
ARG NODE_JS_VERSION=20
2+
ARG NODE_JS_VERSION=22
33
FROM node:${NODE_JS_VERSION}-bullseye
44

55
COPY .evergreen/connectivity-tests/krb5.conf /etc/krb5.conf

0 commit comments

Comments
 (0)