Skip to content

Commit 2cb9ff6

Browse files
authored
fix authentication-tests-darwinssl (#1400)
* silence `kinit` check * do not assume existence of `krb5.conf` Instead: check for presence of `kinit` command. `/etc/krb5.conf` does not appear present on macOS hosts. * regenerate Evergreen config
1 parent ca4b609 commit 2cb9ff6

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.evergreen/config_generator/components/funcs/prepare_kerberos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class PrepareKerberos(Function):
1212
working_dir='mongoc',
1313
silent=True,
1414
script='''\
15-
if test "${keytab|}" && [[ -f /etc/krb5.conf ]]; then
15+
if test "${keytab|}" && command -v kinit >/dev/null; then
1616
echo "${keytab}" > /tmp/drivers.keytab.base64
1717
base64 --decode /tmp/drivers.keytab.base64 > /tmp/drivers.keytab
1818
if touch /etc/krb5.conf 2>/dev/null; then

.evergreen/generated_configs/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ functions:
274274
args:
275275
- -c
276276
- |
277-
if test "${keytab|}" && [[ -f /etc/krb5.conf ]]; then
277+
if test "${keytab|}" && command -v kinit >/dev/null; then
278278
echo "${keytab}" > /tmp/drivers.keytab.base64
279279
base64 --decode /tmp/drivers.keytab.base64 > /tmp/drivers.keytab
280280
if touch /etc/krb5.conf 2>/dev/null; then

.evergreen/generated_configs/tasks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1961,7 +1961,7 @@ tasks:
19611961
- func: bootstrap-mongo-orchestration
19621962
- func: run-mock-kms-servers
19631963
- func: run-tests
1964-
- name: earthly-build-and-test
1964+
- name: earthly-build-check
19651965
run_on:
19661966
- ubuntu2204-small
19671967
- ubuntu2204-large

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ esac
6262
: "${test_gssapi:?}"
6363
: "${ip_addr:?}"
6464

65-
if command -v kinit && [[ -f /tmp/drivers.keytab ]]; then
65+
if command -v kinit >/dev/null && [[ -f /tmp/drivers.keytab ]]; then
6666
kinit -k -t /tmp/drivers.keytab -p [email protected] || true
6767
fi
6868

0 commit comments

Comments
 (0)