From bbd8548fdd0de12129a27914329386c5db1679cf Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 16 Sep 2024 19:19:23 -0500
Subject: [PATCH 1/2] GODRIVER-3342 Update MacOS Hosts for Evergreen Host
 Migration

---
 .evergreen/config.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index c25e2e1afc..bf164f1a94 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2010,9 +2010,9 @@ axes:
         run_on: rhel8.7-large
         variables:
           GO_DIST: "/opt/golang/go1.22"
-      - id: "macos11"
-        display_name: "MacOS 11.0"
-        run_on: macos-1100
+      - id: "macos"
+        display_name: "MacOS 14.0"
+        run_on: macos-14
         batchtime: 1440 # Run at most once per 24 hours.
         variables:
           GO_DIST: "/opt/golang/go1.22"
@@ -2034,9 +2034,9 @@ axes:
         run_on: rhel8.7-large
         variables:
           GO_DIST: "/opt/golang/go1.22"
-      - id: "macos11"
-        display_name: "MacOS 11.0"
-        run_on: macos-1100
+      - id: "macos"
+        display_name: "MacOS 14.0"
+        run_on: macos-14
         batchtime: 1440 # Run at most once per 24 hours.
         variables:
           GO_DIST: "/opt/golang/go1.22"
@@ -2066,9 +2066,9 @@ axes:
         run_on: ubuntu2004-test
         variables:
           GO_DIST: "/opt/golang/go1.22"
-      - id: "macos11"
-        display_name: "MacOS 11.0"
-        run_on: macos-1100
+      - id: "macos"
+        display_name: "MacOS 14.0"
+        run_on: macos-14
         batchtime: 1440 # Run at most once per 24 hours.
         variables:
           GO_DIST: "/opt/golang/go1.22"
@@ -2500,7 +2500,7 @@ buildvariants:
       - name: ".ocsp-rsa !.ocsp-staple"
 
   - matrix_name: "ocsp-test-macos"
-    matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos11"] }
+    matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos"] }
     display_name: "OCSP ${version} ${os-ssl-40}"
     batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README
     tasks:

From ce6b27c2895a5415d2496fc208e7ba314b3e5496 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 16 Sep 2024 19:52:51 -0500
Subject: [PATCH 2/2] fix kinit

---
 etc/run-enterprise-gssapi-test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/etc/run-enterprise-gssapi-test.sh b/etc/run-enterprise-gssapi-test.sh
index 541c3a54f8..6339d512ff 100755
--- a/etc/run-enterprise-gssapi-test.sh
+++ b/etc/run-enterprise-gssapi-test.sh
@@ -7,8 +7,7 @@ set -eu
 if [ "Windows_NT" = "${OS:-}" ]; then
     export MONGODB_URI="mongodb://${PRINCIPAL/@/%40}:${SASL_PASS}@${SASL_HOST}:${SASL_PORT}/kerberos?authMechanism=GSSAPI"
 else
-    echo "${KEYTAB_BASE64}" > /tmp/drivers.keytab.base64
-    base64 --decode /tmp/drivers.keytab.base64 > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
+    echo ${KEYTAB_BASE64} | base64 -d > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
     mkdir -p ~/.krb5
     cat .evergreen/krb5.config | tee -a ~/.krb5/config
     kinit -k -t ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab -p "${PRINCIPAL}"