Skip to content
Merged
Show file tree
Hide file tree
Changes from 25 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
17 changes: 17 additions & 0 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,17 @@ functions:
cd ${PROJECT_DIRECTORY}
make test

"run csfle test":
- command: ec2.assume_role
params:
role_arn: ${aws_test_secrets_role}
- command: subprocess.exec
type: test
params:
binary: bash
include_expansions_in_env: [AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
args: [src/.evergreen/tests/test-csfle.sh]

"run cli test partial":
- command: subprocess.exec
type: test
Expand Down Expand Up @@ -974,6 +985,11 @@ tasks:
commands:
- func: "run install binaries test"

- name: "test-csfle"
tags: ["pr"]
commands:
- func: "run csfle test"

- name: "test-cli-full"
tags: ["pr"]
commands:
Expand Down Expand Up @@ -1421,6 +1437,7 @@ buildvariants:
then:
add_tasks:
- "test-install-binaries"
- "test-csfle"
- "test-cli-full"
- "test-8.0-standalone-require-api"

Expand Down
8 changes: 1 addition & 7 deletions .evergreen/csfle/activate-kmstlsvenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,10 @@ activate_kmstlsvenv() {

local packages=(
"boto3~=1.35.0"
"git+https://github.com/kevinAlbs/PyKMIP.git@DRIVERS-2659" # Add work around for DRIVERS-2659
"git+https://github.com/blink1073/PyKMIP.git@remove-ssl-wrap-socket" # Add work around for DRIVERS-2743
"sqlalchemy<2.0.0" # sqlalchemy.exc.InvalidRequestError: Implicitly combining column managed_objects.uid with column crypto_objects.uid under attribute 'unique_identifier'.
)

if [[ "$OSTYPE" == darwin16 && "$HOSTTYPE" == x86_64 ]]; then
# Avoid `error: thread-local storage is not supported for the current
# target` on macos-1012.
packages+=("greenlet<2.0")
fi

if ! python -m pip install -q -U "${packages[@]}"; then
# Avoid `error: can't find Rust compiler`.
# Assume install failure at this point is due to new versions of
Expand Down
Loading