Skip to content

Commit 5f90032

Browse files
authored
GODRIVER-3342 Update MacOS Hosts for Evergreen Host Migration (#1816)
1 parent e556841 commit 5f90032

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.evergreen/config.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,9 +2010,9 @@ axes:
20102010
run_on: rhel8.7-large
20112011
variables:
20122012
GO_DIST: "/opt/golang/go1.22"
2013-
- id: "macos11"
2014-
display_name: "MacOS 11.0"
2015-
run_on: macos-1100
2013+
- id: "macos"
2014+
display_name: "MacOS 14.0"
2015+
run_on: macos-14
20162016
batchtime: 1440 # Run at most once per 24 hours.
20172017
variables:
20182018
GO_DIST: "/opt/golang/go1.22"
@@ -2034,9 +2034,9 @@ axes:
20342034
run_on: rhel8.7-large
20352035
variables:
20362036
GO_DIST: "/opt/golang/go1.22"
2037-
- id: "macos11"
2038-
display_name: "MacOS 11.0"
2039-
run_on: macos-1100
2037+
- id: "macos"
2038+
display_name: "MacOS 14.0"
2039+
run_on: macos-14
20402040
batchtime: 1440 # Run at most once per 24 hours.
20412041
variables:
20422042
GO_DIST: "/opt/golang/go1.22"
@@ -2066,9 +2066,9 @@ axes:
20662066
run_on: ubuntu2004-test
20672067
variables:
20682068
GO_DIST: "/opt/golang/go1.22"
2069-
- id: "macos11"
2070-
display_name: "MacOS 11.0"
2071-
run_on: macos-1100
2069+
- id: "macos"
2070+
display_name: "MacOS 14.0"
2071+
run_on: macos-14
20722072
batchtime: 1440 # Run at most once per 24 hours.
20732073
variables:
20742074
GO_DIST: "/opt/golang/go1.22"
@@ -2500,7 +2500,7 @@ buildvariants:
25002500
- name: ".ocsp-rsa !.ocsp-staple"
25012501

25022502
- matrix_name: "ocsp-test-macos"
2503-
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos11"] }
2503+
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos"] }
25042504
display_name: "OCSP ${version} ${os-ssl-40}"
25052505
batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README
25062506
tasks:

etc/run-enterprise-gssapi-test.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ set -eu
77
if [ "Windows_NT" = "${OS:-}" ]; then
88
export MONGODB_URI="mongodb://${PRINCIPAL/@/%40}:${SASL_PASS}@${SASL_HOST}:${SASL_PORT}/kerberos?authMechanism=GSSAPI"
99
else
10-
echo "${KEYTAB_BASE64}" > /tmp/drivers.keytab.base64
11-
base64 --decode /tmp/drivers.keytab.base64 > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
10+
echo ${KEYTAB_BASE64} | base64 -d > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
1211
mkdir -p ~/.krb5
1312
cat .evergreen/krb5.config | tee -a ~/.krb5/config
1413
kinit -k -t ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab -p "${PRINCIPAL}"

0 commit comments

Comments
 (0)