GODRIVER-3342 Update MacOS Hosts for Evergreen Host Migration (#1816)

mongodb · Sep 17, 2024 · 5f90032 · 5f90032
1 parent e556841
commit 5f90032
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git 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:

diff --git 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}"