diff --git a/.evergreen.yml b/.evergreen.yml index 372f570ee..bd10e1296 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -17204,7 +17204,7 @@ tasks: buildvariants: - name: darwin_unit display_name: "MacOS Big Sur (Unit tests)" - run_on: macos-1100 + run_on: macos-11 expansions: executable_os_id: darwin-x64 tasks: @@ -17375,7 +17375,7 @@ buildvariants: - name: test_n16_types - name: darwin display_name: "MacOS Big Sur" - run_on: macos-1100 + run_on: macos-11 expansions: executable_os_id: darwin-x64 tasks: @@ -17387,7 +17387,7 @@ buildvariants: - name: sign_artifact_darwin_arm64 - name: darwin_arm64 display_name: "MacOS Big Sur (arm64)" - run_on: macos-1100-arm64 + run_on: macos-11-arm64 expansions: executable_os_id: darwin-arm64 tasks: @@ -17689,7 +17689,7 @@ buildvariants: - name: verify_artifact_win32msi_x64 - name: verify_mac_artifact display_name: "MacOS (Signature Verification)" - run_on: macos-1100 + run_on: macos-11 tasks: - name: verify_artifact_darwin_arm64 - name: verify_artifact_darwin_x64 @@ -18285,17 +18285,17 @@ buildvariants: - name: pkg_test_ssh_win32msi_x64 - name: pkg_smoke_tests_macos_1100_x64 display_name: "package smoke tests (macos 11.00 x64)" - run_on: macos-1100 + run_on: macos-11 tasks: - name: pkg_test_macos_darwin_x64 - name: pkg_smoke_tests_macos_1100_arm64 display_name: "package smoke tests (macos 11.00 arm64)" - run_on: macos-1100-arm64 + run_on: macos-11-arm64 tasks: - name: pkg_test_macos_darwin_arm64 - name: pkg_smoke_tests_macos_1300_arm64 display_name: "package smoke tests (macos 13.00 arm64)" - run_on: macos-1300-arm64 + run_on: macos-13-arm64 tasks: - name: pkg_test_macos_darwin_arm64 - name: pkg_smoke_tests_macos_1400_x64 diff --git a/.evergreen/compilation-context-expansions.test.sh b/.evergreen/compilation-context-expansions.test.sh index 319586817..b9f978893 100755 --- a/.evergreen/compilation-context-expansions.test.sh +++ b/.evergreen/compilation-context-expansions.test.sh @@ -20,9 +20,9 @@ amazon2-arm64-large=true amazon2-large=false debian10-small=false debian11-small=false -macos-1100=true -macos-1100-arm64=true -macos-1300-arm64=true +macos-11=true +macos-11-arm64=true +macos-13-arm64=true rhel70-build=true rhel70-large=true rhel72-zseries-large=true @@ -66,4 +66,4 @@ for TEST in $TEST_CASES ; do fi done -exit $EXIT_VAL \ No newline at end of file +exit $EXIT_VAL diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index dee4394da..13d3831ac 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -1494,7 +1494,7 @@ tasks: buildvariants: - name: darwin_unit display_name: "MacOS Big Sur (Unit tests)" - run_on: macos-1100 + run_on: macos-11 expansions: executable_os_id: darwin-x64 tasks: @@ -1504,7 +1504,7 @@ buildvariants: <% } %> - name: darwin display_name: "MacOS Big Sur" - run_on: macos-1100 + run_on: macos-11 expansions: executable_os_id: darwin-x64 tasks: @@ -1516,7 +1516,7 @@ buildvariants: - name: sign_artifact_darwin_arm64 - name: darwin_arm64 display_name: "MacOS Big Sur (arm64)" - run_on: macos-1100-arm64 + run_on: macos-11-arm64 expansions: executable_os_id: darwin-arm64 tasks: @@ -1577,7 +1577,7 @@ buildvariants: - name: verify_artifact_win32msi_x64 - name: verify_mac_artifact display_name: "MacOS (Signature Verification)" - run_on: macos-1100 + run_on: macos-11 tasks: - name: verify_artifact_darwin_arm64 - name: verify_artifact_darwin_x64 @@ -1945,17 +1945,17 @@ buildvariants: - name: pkg_test_ssh_win32msi_x64 - name: pkg_smoke_tests_macos_1100_x64 display_name: "package smoke tests (macos 11.00 x64)" - run_on: macos-1100 + run_on: macos-11 tasks: - name: pkg_test_macos_darwin_x64 - name: pkg_smoke_tests_macos_1100_arm64 display_name: "package smoke tests (macos 11.00 arm64)" - run_on: macos-1100-arm64 + run_on: macos-11-arm64 tasks: - name: pkg_test_macos_darwin_arm64 - name: pkg_smoke_tests_macos_1300_arm64 display_name: "package smoke tests (macos 13.00 arm64)" - run_on: macos-1300-arm64 + run_on: macos-13-arm64 tasks: - name: pkg_test_macos_darwin_arm64 - name: pkg_smoke_tests_macos_1400_x64