Skip to content

RUBY-2832 Test FLE via docker #2401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .evergreen/config-atlas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,10 @@ axes:
display_name: debian10
variables:
DOCKER_DISTRO: debian10
- id: ubuntu1804
display_name: ubuntu1804
variables:
DOCKER_DISTRO: ubuntu1804

- id: "compressor"
display_name: Compressor
Expand Down
8 changes: 8 additions & 0 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,10 @@ tasks:
commands:
- func: "export FLE credentials"
- func: "run tests"
- name: "test-fle-via-docker"
commands:
- func: "export FLE credentials"
- func: "run tests via docker"
- name: "test-aws-auth"
commands:
- func: "export AWS auth credentials"
Expand Down Expand Up @@ -664,6 +668,10 @@ axes:
display_name: debian10
variables:
DOCKER_DISTRO: debian10
- id: ubuntu1804
display_name: ubuntu1804
variables:
DOCKER_DISTRO: ubuntu1804

- id: "compressor"
display_name: Compressor
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config/axes.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ axes:
- id: docker-distro
display_name: Docker Distro
values:
<% %w(debian92 debian10).each do |distro| %>
<% %w(debian92 debian10 ubuntu1804).each do |distro| %>
- id: <%= distro %>
display_name: <%= distro %>
variables:
Expand Down
4 changes: 4 additions & 0 deletions .evergreen/config/common.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,10 @@ tasks:
commands:
- func: "export FLE credentials"
- func: "run tests"
- name: "test-fle-via-docker"
commands:
- func: "export FLE credentials"
- func: "run tests via docker"
- name: "test-aws-auth"
commands:
- func: "export AWS auth credentials"
Expand Down
6 changes: 5 additions & 1 deletion .evergreen/run-tests-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ fi
params=
for var in MONGODB_VERSION TOPOLOGY RVM_RUBY \
OCSP_ALGORITHM OCSP_STATUS OCSP_DELEGATE OCSP_MUST_STAPLE \
OCSP_CONNECTIVITY OCSP_VERIFIER
OCSP_CONNECTIVITY OCSP_VERIFIER FLE
do
value="${!var}"
if test -n "$value"; then
params="$params $var=${!var}"
fi
done

if test -f .env.private; then
params="$params -a .env.private"
fi

# OCSP verifier tests need debian10 so that ocsp mock works
./.evergreen/test-on-docker -p -d $DOCKER_DISTRO $params