Skip to content

Commit 6159250

Browse files
authored
CDRIVER-5645 fix and update build-and-run-authentication-tests-* tasks (#1848)
* Update OpenSSL download URLs to use GitHub release artifacts * CDRIVER-5645 remove workarounds for MongoDB server 3.6 non-compatibility * Fix and update paths to headers and binaries
1 parent 2dc348a commit 6159250

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

.evergreen/scripts/install-ssl.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ install_openssl() {
4747
declare ssl_version="${SSL##openssl-}"
4848
declare tmp
4949
tmp="$(echo "${ssl_version:?}" | tr . _)"
50-
curl -L --retry 5 -o ssl.tar.gz "https://github.com/openssl/openssl/archive/OpenSSL_${tmp}.tar.gz"
50+
curl -L --retry 5 -o ssl.tar.gz "https://github.com/openssl/openssl/releases/download/OpenSSL_${tmp}/openssl-${ssl_version}.tar.gz"
5151
tar zxf ssl.tar.gz
52-
pushd "openssl-OpenSSL_${tmp}"
52+
pushd "openssl-${ssl_version}"
5353
(
5454
set -o xtrace
5555
./config --prefix="${openssl_install_dir}" "${ssl_extra_flags[@]}" shared -fPIC
@@ -61,11 +61,11 @@ install_openssl() {
6161
make -j
6262
make install_sw
6363
) >/dev/null
64-
popd # "openssl-OpenSSL_${tmp}"
64+
popd # "openssl-${ssl_version}"
6565
}
6666

6767
install_openssl_fips() {
68-
curl --retry 5 -o fips.tar.gz https://www.openssl.org/source/openssl-fips-2.0.16.tar.gz
68+
curl -L --retry 5 -o fips.tar.gz https://github.com/openssl/openssl/releases/download/OpenSSL-fips-2_0_16/openssl-fips-2.0.16.tar.gz
6969
tar zxf fips.tar.gz
7070
pushd openssl-fips-2.0.16
7171
(

.evergreen/scripts/run-auth-tests.sh

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ declare openssl_install_dir="${mongoc_dir}/openssl-install-dir"
2121
declare c_timeout="connectTimeoutMS=30000&serverSelectionTryOnce=false"
2222

2323
declare sasl="OFF"
24-
if grep -q "#define MONGOC_ENABLE_SASL 1" src/libmongoc/src/mongoc/mongoc-config.h; then
24+
if grep -r -q "#define MONGOC_ENABLE_SASL 1" "${install_dir:?}"; then
2525
sasl="ON"
2626
fi
2727

2828
declare ssl="OFF"
29-
if grep -q "#define MONGOC_ENABLE_SSL 1" src/libmongoc/src/mongoc/mongoc-config.h; then
29+
if grep -r -q "#define MONGOC_ENABLE_SSL 1" "${install_dir:?}"; then
3030
ssl="ON"
3131
fi
3232

@@ -41,20 +41,20 @@ declare test_gssapi
4141
declare ip_addr
4242
case "${OSTYPE}" in
4343
cygwin)
44-
ping="./src/libmongoc/Debug/mongoc-ping.exe"
45-
test_gssapi="./src/libmongoc/Debug/test-mongoc-gssapi.exe"
44+
ping="${mongoc_dir}/cmake-build/src/libmongoc/Debug/mongoc-ping.exe"
45+
test_gssapi="${mongoc_dir}/cmake-build/src/libmongoc/Debug/test-mongoc-gssapi.exe"
4646
ip_addr="$(getent hosts "${auth_host:?}" | head -n 1 | awk '{print $1}')"
4747
;;
4848

4949
darwin*)
50-
ping="./src/libmongoc/mongoc-ping"
51-
test_gssapi="./src/libmongoc/test-mongoc-gssapi"
50+
ping="${mongoc_dir}/cmake-build/src/libmongoc/mongoc-ping"
51+
test_gssapi="${mongoc_dir}/cmake-build/src/libmongoc/test-mongoc-gssapi"
5252
ip_addr="$(dig "${auth_host:?}" +short | tail -1)"
5353
;;
5454

5555
*)
56-
ping="./src/libmongoc/mongoc-ping"
57-
test_gssapi="./src/libmongoc/test-mongoc-gssapi"
56+
ping="${mongoc_dir}/cmake-build/src/libmongoc/mongoc-ping"
57+
test_gssapi="${mongoc_dir}/cmake-build/src/libmongoc/test-mongoc-gssapi"
5858
ip_addr="$(getent hosts "${auth_host:?}" | head -n 1 | awk '{print $1}')"
5959
;;
6060
esac
@@ -100,16 +100,11 @@ elif command -v otool >/dev/null; then
100100
fi
101101

102102
if [[ "${ssl}" != "OFF" ]]; then
103-
{
104-
# Skip 3.6. Remove this block when resolving CDRIVER-5645.
105-
echo "Skipping tests on server 3.6 (using 'auth_host' or 'auth_gssapi') until DEVPROD-9029 is addressed."
106-
} || {
107103
# FIXME: CDRIVER-2008 for the cygwin check
108104
if [[ "${OSTYPE}" != "cygwin" ]]; then
109105
echo "Authenticating using X.509"
110106
LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US@${auth_host}/?ssl=true&authMechanism=MONGODB-X509&sslClientCertificateKeyFile=src/libmongoc/tests/x509gen/ldaptest-client-key-and-cert.pem&sslCertificateAuthorityFile=src/libmongoc/tests/x509gen/ldaptest-ca-cert.crt&sslAllowInvalidHostnames=true&${c_timeout}"
111107
fi
112-
}
113108
echo "Connecting to Atlas Free Tier"
114109
LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "${atlas_free:?}&${c_timeout}"
115110
echo "Connecting to Atlas Free Tier with SRV"
@@ -149,10 +144,6 @@ if [[ "${ssl}" != "OFF" ]]; then
149144
fi
150145
fi
151146

152-
{
153-
# Skip 3.6. Remove this block when resolving CDRIVER-5645.
154-
echo "Skipping tests on server 3.6 (using 'auth_host' or 'auth_gssapi') until DEVPROD-9029 is addressed."
155-
} || {
156147
echo "Authenticating using PLAIN"
157148
LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_plain:?}@${auth_host}/?authMechanism=PLAIN&${c_timeout}"
158149

@@ -183,4 +174,3 @@ if [[ "${sasl}" != "OFF" ]]; then
183174
LD_LIBRARY_PATH="${openssl_lib_prefix}" "${ping}" "mongodb://${auth_gssapi_utf8:?}@${auth_host}/?authMechanism=GSSAPI&${c_timeout}"
184175
fi
185176
fi
186-
}

0 commit comments

Comments
 (0)