Skip to content

fix authentication-tests-darwinssl #1400

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.

Sign up for GitHub

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 3 commits into from
Sep 13, 2023
Merged

fix authentication-tests-darwinssl #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d789dc9
silence `kinit` check
kevinAlbs Sep 11, 2023
3811714
do not assume existence of `krb5.conf`
kevinAlbs Sep 11, 2023
f434d3c
regenerate Evergreen config
kevinAlbs Sep 11, 2023
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
2 changes: 1 addition & 1 deletion .evergreen/config_generator/components/funcs/prepare_kerberos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class PrepareKerberos(Function):
working_dir='mongoc',
silent=True,
script='''\
if test "${keytab|}" && [[ -f /etc/krb5.conf ]]; then
if test "${keytab|}" && command -v kinit >/dev/null; then
echo "${keytab}" > /tmp/drivers.keytab.base64
base64 --decode /tmp/drivers.keytab.base64 > /tmp/drivers.keytab
if touch /etc/krb5.conf 2>/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/generated_configs/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ functions:
args:
- -c
- |
if test "${keytab|}" && [[ -f /etc/krb5.conf ]]; then
if test "${keytab|}" && command -v kinit >/dev/null; then
echo "${keytab}" > /tmp/drivers.keytab.base64
base64 --decode /tmp/drivers.keytab.base64 > /tmp/drivers.keytab
if touch /etc/krb5.conf 2>/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/generated_configs/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ tasks:
- func: bootstrap-mongo-orchestration
- func: run-mock-kms-servers
- func: run-tests
- name: earthly-build-and-test
- name: earthly-build-check
Copy link
Contributor

Choose a reason for hiding this comment

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

Confirming, is the inclusion of this change intentional?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes. I think the Evergreen config was not regenerated after the task was renamed in 6e6546b.

run_on:
- ubuntu2204-small
- ubuntu2204-large
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/scripts/run-auth-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ esac
: "${test_gssapi:?}"
: "${ip_addr:?}"

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

Expand Down