Skip to content
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
24 changes: 4 additions & 20 deletions evergreen/evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,7 @@ functions:
script: |
${PREPARE_SHELL}
rm -rf $DRIVERS_TOOLS
if [ "${project}" = "drivers-tools" ]; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not need this check, as we definitely know we are not in "drivers-tools" project.

# If this was a patch build, doing a fresh clone would not actually test the patch
cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
else
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
fi
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config

# Upload build artifacts that other tasks may depend on
Expand Down Expand Up @@ -442,22 +437,10 @@ functions:
- command: shell.exec
type: test
params:
silent: true
shell: "bash"
working_dir: mongo-csharp-driver
include_expansions_in_env:
- "ATLAS_FREE"
- "ATLAS_FREE_SRV"
- "ATLAS_REPLICA"
- "ATLAS_REPLICA_SRV"
- "ATLAS_SHARDED"
- "ATLAS_SHARDED_SRV"
- "ATLAS_TLS11"
- "ATLAS_TLS11_SRV"
- "ATLAS_TLS12"
- "ATLAS_TLS12_SRV"
- "ATLAS_SERVERLESS"
- "ATLAS_SERVERLESS_SRV"
script: |
. ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
. evergreen/run-atlas-connectivity-tests.sh

run-gssapi-auth-tests:
Expand Down Expand Up @@ -1261,6 +1244,7 @@ tasks:

- name: atlas-connectivity-tests
commands:
- func: assume-ec2-role
- func: run-atlas-connectivity-tests

- name: test-gssapi
Expand Down
16 changes: 8 additions & 8 deletions tests/AtlasConnectivity.Tests/ConnectivityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ public ConnectivityTests(ITestOutputHelper testOutputHelper)

// public methods
[Theory]
[InlineData("ATLAS_REPL")]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have to rename env variables to match what we have in vault.

[InlineData("ATLAS_SHRD")]
[InlineData("ATLAS_FREE")]
[InlineData("ATLAS_FREE_SRV")]
[InlineData("ATLAS_REPLICA")]
[InlineData("ATLAS_REPLICA_SRV")]
[InlineData("ATLAS_SHARDED")]
[InlineData("ATLAS_SHARDED_SRV")]
[InlineData("ATLAS_TLS11")]
[InlineData("ATLAS_TLS11_SRV")]
[InlineData("ATLAS_TLS12")]
[InlineData("ATLAS_TLS12_SRV")]
[InlineData("ATLAS_SERVERLESS")]
[InlineData("ATLAS_SERVERLESS_SRV")]
[InlineData("ATLAS_SRV_REPL")]
[InlineData("ATLAS_SRV_SHRD")]
[InlineData("ATLAS_SRV_FREE")]
[InlineData("ATLAS_SRV_TLS11")]
[InlineData("ATLAS_SRV_TLS12")]
[InlineData("ATLAS_SRV_SERVERLESS")]
public void Connection_to_Atlas_should_work(string environmentVariableName)
{
var connectionString = Environment.GetEnvironmentVariable(environmentVariableName);
Expand Down