Skip to content

Commit 052961b

Browse files
matthewdalematthewdale
committed
GODRIVER-1951 Update the Go version for Evergreen builds to 1.16
1 parent 899e5cd commit 052961b

File tree

2 files changed

+41
-32
lines changed

2 files changed

+41
-32
lines changed

‎.evergreen/config.yml

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,19 @@ functions:
315315
. ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
316316
fi
317317
318+
# If GO_BUILD_TAGS is not set, set the default Go build tags to "-tags cse" to enable
319+
# client-side encryption, which requires linking the libmongocrypt C library.
320+
if [ -z ${GO_BUILD_TAGS+x} ]; then
321+
GO_BUILD_TAGS="-tags cse"
322+
fi
323+
318324
export GOFLAGS=-mod=vendor
319325
AUTH=${AUTH} \
320326
SSL=${SSL} \
321327
MONGODB_URI="${MONGODB_URI}" \
322328
TOPOLOGY=${TOPOLOGY} \
323329
MONGO_GO_DRIVER_COMPRESSOR=${MONGO_GO_DRIVER_COMPRESSOR} \
324-
BUILD_TAGS="-tags cse" \
330+
BUILD_TAGS=${GO_BUILD_TAGS} \
325331
AWS_ACCESS_KEY_ID="${cse_aws_access_key_id}" \
326332
AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}" \
327333
AWS_DEFAULT_REGION="us-east-1" \
@@ -1824,87 +1830,90 @@ axes:
18241830
- id: os-ssl-legacy
18251831
display_name: OS
18261832
values:
1827-
- id: "ubuntu1404-go-1-15"
1833+
- id: "ubuntu1404-go-1-16"
18281834
display_name: "Ubuntu 14.04"
18291835
run_on: ubuntu1404-test
18301836
variables:
1831-
GO_DIST: "/opt/golang/go1.15"
1837+
GO_DIST: "/opt/golang/go1.16"
1838+
# libmongocrypt and client-side encryption aren't supported on Ubuntu 14.04, so exclude
1839+
# all build tags to prevent attempting to run the client-side encryption tests.
1840+
GO_BUILD_TAGS: ""
18321841

18331842
# OSes that require >= 3.2 for SSL
18341843
- id: os-ssl-32
18351844
display_name: OS
18361845
values:
1837-
- id: "windows-64-go-1-15"
1846+
- id: "windows-64-go-1-16"
18381847
display_name: "Windows 64-bit"
18391848
run_on:
18401849
- windows-64-vs2017-test
18411850
variables:
18421851
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1843-
GO_DIST: "C:\\golang\\go1.15"
1852+
GO_DIST: "C:\\golang\\go1.16"
18441853
PYTHON3_BINARY: "C:/python/Python38/python.exe"
18451854
VENV_BIN_DIR: "Scripts"
1846-
- id: "ubuntu1604-64-go-1-15"
1855+
- id: "ubuntu1604-64-go-1-16"
18471856
display_name: "Ubuntu 16.04"
18481857
run_on: ubuntu1604-build
18491858
variables:
1850-
GO_DIST: "/opt/golang/go1.15"
1859+
GO_DIST: "/opt/golang/go1.16"
18511860
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
1852-
- id: "osx-go-1-15"
1861+
- id: "osx-go-1-16"
18531862
display_name: "MacOS 10.14"
18541863
run_on: macos-1014
18551864
variables:
1856-
GO_DIST: "/opt/golang/go1.15"
1865+
GO_DIST: "/opt/golang/go1.16"
18571866
PYTHON3_BINARY: python3
18581867

18591868
# OSes that require >= 4.0 for SSL
18601869
- id: os-ssl-40
18611870
display_name: OS
18621871
values:
1863-
- id: "windows-64-go-1-15"
1872+
- id: "windows-64-go-1-16"
18641873
display_name: "Windows 64-bit"
18651874
run_on:
18661875
- windows-64-vs2017-test
18671876
variables:
18681877
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1869-
GO_DIST: "C:\\golang\\go1.15"
1878+
GO_DIST: "C:\\golang\\go1.16"
18701879
PYTHON3_BINARY: "C:/python/Python38/python.exe"
18711880
VENV_BIN_DIR: "Scripts"
1872-
- id: "ubuntu1804-64-go-1-15"
1881+
- id: "ubuntu1804-64-go-1-16"
18731882
display_name: "Ubuntu 18.04"
18741883
run_on: ubuntu1804-build
18751884
variables:
1876-
GO_DIST: "/opt/golang/go1.15"
1885+
GO_DIST: "/opt/golang/go1.16"
18771886
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
1878-
- id: "osx-go-1-15"
1887+
- id: "osx-go-1-16"
18791888
display_name: "MacOS 10.14"
18801889
run_on: macos-1014
18811890
variables:
1882-
GO_DIST: "/opt/golang/go1.15"
1891+
GO_DIST: "/opt/golang/go1.16"
18831892
PYTHON3_BINARY: python3
18841893

18851894
- id: os-aws-auth
18861895
display_name: OS
18871896
values:
1888-
- id: "windows-64-vsMulti-small-go-1-15"
1897+
- id: "windows-64-vsMulti-small-go-1-16"
18891898
display_name: "Windows 64-bit"
18901899
run_on:
18911900
- windows-64-vsMulti-small
18921901
variables:
18931902
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1894-
GO_DIST: "C:\\golang\\go1.15"
1903+
GO_DIST: "C:\\golang\\go1.16"
18951904
SKIP_ECS_AUTH_TEST: true
18961905
PYTHON3: "C:/python/Python38/python.exe"
1897-
- id: "ubuntu1804-64-go-1-15"
1906+
- id: "ubuntu1804-64-go-1-16"
18981907
display_name: "Ubuntu 18.04"
18991908
run_on: ubuntu1804-test
19001909
variables:
1901-
GO_DIST: "/opt/golang/go1.15"
1910+
GO_DIST: "/opt/golang/go1.16"
19021911
PYTHON3: python3
1903-
- id: "osx-go-1-15"
1912+
- id: "osx-go-1-16"
19041913
display_name: "MacOS 10.14"
19051914
run_on: macos-1014
19061915
variables:
1907-
GO_DIST: "/opt/golang/go1.15"
1916+
GO_DIST: "/opt/golang/go1.16"
19081917
SKIP_ECS_AUTH_TEST: true
19091918
SKIP_EC2_AUTH_TEST: true
19101919
PYTHON3: python3
@@ -1915,7 +1924,7 @@ buildvariants:
19151924
run_on:
19161925
- ubuntu1804-build
19171926
expansions:
1918-
GO_DIST: "/opt/golang/go1.15"
1927+
GO_DIST: "/opt/golang/go1.16"
19191928
tasks:
19201929
- name: ".static-analysis"
19211930

@@ -1924,7 +1933,7 @@ buildvariants:
19241933
run_on:
19251934
- ubuntu1804-build
19261935
expansions:
1927-
GO_DIST: "/opt/golang/go1.15"
1936+
GO_DIST: "/opt/golang/go1.16"
19281937
tasks:
19291938
- name: ".performance"
19301939

@@ -1933,7 +1942,7 @@ buildvariants:
19331942
run_on:
19341943
- ubuntu1804-test
19351944
expansions:
1936-
GO_DIST: "/opt/golang/go1.15"
1945+
GO_DIST: "/opt/golang/go1.16"
19371946
tasks:
19381947
- name: ".compile-check"
19391948

@@ -1942,7 +1951,7 @@ buildvariants:
19421951
run_on:
19431952
- ubuntu1804-build
19441953
expansions:
1945-
GO_DIST: "/opt/golang/go1.15"
1954+
GO_DIST: "/opt/golang/go1.16"
19461955
tasks:
19471956
- name: "atlas-test"
19481957

@@ -1951,7 +1960,7 @@ buildvariants:
19511960
run_on:
19521961
- ubuntu1804-build
19531962
expansions:
1954-
GO_DIST: "/opt/golang/go1.15"
1963+
GO_DIST: "/opt/golang/go1.16"
19551964
tasks:
19561965
- name: "test-atlas-data-lake"
19571966

@@ -2012,22 +2021,22 @@ buildvariants:
20122021

20132022
# GODRIVER-1961 Upgrade OCSP tests to use os-ssl-40 and Ubuntu 18.04.
20142023
- matrix_name: "ocsp-test"
2015-
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["ubuntu1604-64-go-1-15"] }
2024+
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["ubuntu1604-64-go-1-16"] }
20162025
display_name: "OCSP ${version} ${os-ssl-32}"
20172026
batchtime: 20160 # 14 days
20182027
tasks:
20192028
- name: ".ocsp"
20202029

20212030
- matrix_name: "ocsp-test-windows"
2022-
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["windows-64-go-1-15"] }
2031+
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["windows-64-go-1-16"] }
20232032
display_name: "OCSP ${version} ${os-ssl-32}"
20242033
batchtime: 20160 # 14 days
20252034
tasks:
20262035
# Windows MongoDB servers do not staple OCSP responses and only support RSA.
20272036
- name: ".ocsp-rsa !.ocsp-staple"
20282037

20292038
- matrix_name: "ocsp-test-macos"
2030-
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["osx-go-1-15"] }
2039+
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["osx-go-1-16"] }
20312040
display_name: "OCSP ${version} ${os-ssl-32}"
20322041
batchtime: 20160 # 14 days
20332042
tasks:
@@ -2041,14 +2050,14 @@ buildvariants:
20412050
- name: ".versioned-api"
20422051

20432052
- matrix_name: "kms-tls-test"
2044-
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-15"] }
2053+
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-16"] }
20452054
display_name: "KMS TLS ${version} ${os-ssl-40}"
20462055
tasks:
20472056
- name: ".kms-tls"
20482057

20492058
- matrix_name: "load-balancer-test"
20502059
# The LB software is only available on Ubuntu 18.04, so we don't test on all OSes.
2051-
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-15"] }
2060+
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-16"] }
20522061
display_name: "Load Balancer Support ${version} ${os-ssl-40}"
20532062
tasks:
20542063
- name: ".load-balancer"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ evg-test-load-balancers:
170170
go test $(BUILD_TAGS) ./mongo/integration -run TestUnifiedSpecs/retryable-reads -v -timeout $(TEST_TIMEOUT)s >> test.suite
171171
go test $(BUILD_TAGS) ./mongo/integration -run TestRetryableWritesSpec -v -timeout $(TEST_TIMEOUT)s >> test.suite
172172
go test $(BUILD_TAGS) ./mongo/integration -run TestChangeStreamSpec -v -timeout $(TEST_TIMEOUT)s >> test.suite
173-
go test $(BULID_TAGS) ./mongo/integration -run TestInitialDNSSeedlistDiscoverySpec/load_balanced -v -timeout $(TEST_TIMEOUT)s >> test.suite
173+
go test $(BUILD_TAGS) ./mongo/integration -run TestInitialDNSSeedlistDiscoverySpec/load_balanced -v -timeout $(TEST_TIMEOUT)s >> test.suite
174174
go test $(BUILD_TAGS) ./mongo/integration -run TestLoadBalancerSupport -v -timeout $(TEST_TIMEOUT)s >> test.suite
175175
go test $(BUILD_TAGS) ./mongo/integration/unified -run TestUnifiedSpec -v -timeout $(TEST_TIMEOUT)s >> test.suite
176176

0 commit comments

Comments
 (0)