Skip to content

Commit 5660bdf

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents e11c133 + 21313cb commit 5660bdf

File tree

249 files changed

+8120
-5951
lines changed

Some content is hidden

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

249 files changed

+8120
-5951
lines changed

‎.evergreen/buildvariants.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ buildvariants:
9090
- name: test-packaged-app-latest
9191
depends_on: package-compass
9292

93+
- name: test-web-sandbox-chrome
94+
9395
- name: test-web-sandbox-firefox
9496

9597
- name: windows

‎.evergreen/config.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,14 @@
140140
}
141141
],
142142
"test-web-sandbox": [
143+
{
144+
"name": "chrome",
145+
"vars": {
146+
"mongodb_version": "latest-alpha-enterprise",
147+
"browser_name": "chrome"
148+
},
149+
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
150+
},
143151
{
144152
"name": "firefox",
145153
"vars": {

‎.evergreen/start-docker-envs.sh‎

Lines changed: 64 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,69 @@
22

33
set -e
44

5-
if ! command -v docker &>/dev/null; then
6-
echo "docker could not be found"
7-
elif ! command -v docker-compose &>/dev/null; then
8-
echo "docker-compose could not be found"
9-
else
10-
echo "Starting test environments"
11-
12-
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
5+
DOCKER_COMPOSE="env MONGODB_VERSION= docker compose"
6+
7+
echo "Checking if docker is available ..."
8+
9+
if ! docker version &>/dev/null; then
10+
echo " docker could not be found"
11+
exit
12+
elif ! docker compose version &>/dev/null; then
13+
echo " docker compose could not be found, trying standalone docker-compose as a fallback"
14+
if ! docker-compose version &>/dev/null; then
15+
echo " docker-compose could not be found"
16+
exit
17+
fi
18+
# TODO(COMPASS-7687): This is only here because of rhel76 that is old enough
19+
# that the docker version installed there doesn't include compose. DevProd
20+
# team suggests that we should switch to Podman on RHEL
1321
DOCKER_COMPOSE="env MONGODB_VERSION= docker-compose"
14-
LOGS_DIR="$SCRIPT_DIR/logs"
15-
mkdir -p "$LOGS_DIR"
16-
17-
git clone -b v1.2.5 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
18-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
19-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
20-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d
21-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml up -d
22-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml up -d
23-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml up -d
24-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml up -d
25-
26-
__stop_all_docker_containers() {
27-
echo "Stopping test environments"
28-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml ps > $LOGS_DIR/docker-enterprise.ps || true;
29-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml ps > $LOGS_DIR/docker-ldap.ps || true;
30-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml ps > $LOGS_DIR/docker-scram.ps || true;
31-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml ps > $LOGS_DIR/docker-sharded.ps || true;
32-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml ps > $LOGS_DIR/docker-ssh.ps || true;
33-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml ps > $LOGS_DIR/docker-tls.ps || true;
34-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml ps > $LOGS_DIR/docker-kerberos.ps || true;
35-
36-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml logs > $LOGS_DIR/docker-enterprise.log || true;
37-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml logs > $LOGS_DIR/docker-ldap.log || true;
38-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml logs > $LOGS_DIR/docker-scram.log || true;
39-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml logs > $LOGS_DIR/docker-sharded.log || true;
40-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml logs > $LOGS_DIR/docker-ssh.log || true;
41-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml logs > $LOGS_DIR/docker-tls.log || true;
42-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml logs > $LOGS_DIR/docker-kerberos.log || true;
43-
44-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans
45-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans
46-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans
47-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans
48-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans
49-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans
50-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans
51-
}
52-
53-
trap "__stop_all_docker_containers" EXIT
5422
fi
23+
24+
echo "Found docker:"
25+
docker version
26+
$DOCKER_COMPOSE version
27+
28+
echo "Starting test environments"
29+
30+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
31+
LOGS_DIR="$SCRIPT_DIR/logs"
32+
mkdir -p "$LOGS_DIR"
33+
34+
git clone -b v1.2.5 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
35+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
36+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
37+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d
38+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml up -d
39+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml up -d
40+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml up -d
41+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml up -d
42+
43+
__stop_all_docker_containers() {
44+
echo "Stopping test environments"
45+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml ps >$LOGS_DIR/docker-enterprise.ps || true
46+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml ps >$LOGS_DIR/docker-ldap.ps || true
47+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml ps >$LOGS_DIR/docker-scram.ps || true
48+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml ps >$LOGS_DIR/docker-sharded.ps || true
49+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml ps >$LOGS_DIR/docker-ssh.ps || true
50+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml ps >$LOGS_DIR/docker-tls.ps || true
51+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml ps >$LOGS_DIR/docker-kerberos.ps || true
52+
53+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml logs >$LOGS_DIR/docker-enterprise.log || true
54+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml logs >$LOGS_DIR/docker-ldap.log || true
55+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml logs >$LOGS_DIR/docker-scram.log || true
56+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml logs >$LOGS_DIR/docker-sharded.log || true
57+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml logs >$LOGS_DIR/docker-ssh.log || true
58+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml logs >$LOGS_DIR/docker-tls.log || true
59+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml logs >$LOGS_DIR/docker-kerberos.log || true
60+
61+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans
62+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans
63+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans
64+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans
65+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans
66+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans
67+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans
68+
}
69+
70+
trap "__stop_all_docker_containers" EXIT

‎.evergreen/tasks.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,24 @@ tasks:
419419
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
420420

421421

422+
- name: test-web-sandbox-chrome
423+
tags: ['required-for-publish', 'run-on-pr']
424+
commands:
425+
- func: prepare
426+
- func: install
427+
- func: bootstrap
428+
vars:
429+
scope: 'compass-e2e-tests'
430+
- func: apply-compass-target-expansion
431+
vars:
432+
compass_distribution: compass
433+
- func: test-web-sandbox
434+
vars:
435+
mongodb_version: 'latest-alpha-enterprise'
436+
browser_name: 'chrome'
437+
compass_distribution: compass
438+
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
439+
422440
- name: test-web-sandbox-firefox
423441
tags: ['required-for-publish', 'run-on-pr']
424442
commands:

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ Gokul Raam <[email protected]>
8181
Bailey Pearson <[email protected]>
8282
Hao <[email protected]>
8383
Paula Stachova <[email protected]>
84+
Basit <[email protected]>

0 commit comments

Comments
 (0)