@@ -141,8 +141,8 @@ functions:
141
141
export UPLOAD_BUCKET="$UPLOAD_BUCKET"
142
142
export PROJECT="$PROJECT"
143
143
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
144
- export PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib /pkgconfig:$(pwd)/install/mongo-c-driver/lib/pkgconfig
145
- export LD_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib
144
+ export PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib64 /pkgconfig:$(pwd)/install/mongo-c-driver/lib/pkgconfig
145
+ export LD_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib64
146
146
export PATH="$PATH"
147
147
EOT
148
148
# See what we variables we've set.
@@ -245,6 +245,7 @@ functions:
245
245
params :
246
246
shell : " bash"
247
247
script : |
248
+ set -x
248
249
${PREPARE_SHELL}
249
250
250
251
MONGODB_VERSION=${VERSION} \
@@ -2082,7 +2083,7 @@ tasks:
2082
2083
export GCPKMS_PROJECT=${GCPKMS_PROJECT}
2083
2084
export GCPKMS_ZONE=${GCPKMS_ZONE}
2084
2085
export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
2085
- tar czf testgcpkms.tgz ./testkms ./install/libmongocrypt/lib /libmongocrypt.*
2086
+ tar czf testgcpkms.tgz ./testkms ./install/libmongocrypt/lib64 /libmongocrypt.*
2086
2087
GCPKMS_SRC=testgcpkms.tgz GCPKMS_DST=$GCPKMS_INSTANCENAME: $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/copy-file.sh
2087
2088
echo "Copying files ... end"
2088
2089
@@ -2101,7 +2102,7 @@ tasks:
2101
2102
export GCPKMS_PROJECT=${GCPKMS_PROJECT}
2102
2103
export GCPKMS_ZONE=${GCPKMS_ZONE}
2103
2104
export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
2104
- GCPKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib MONGODB_URI='mongodb://localhost:27017' PROVIDER='gcp' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
2105
+ GCPKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib64 MONGODB_URI='mongodb://localhost:27017' PROVIDER='gcp' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
2105
2106
2106
2107
- name : " testgcpkms-fail-task"
2107
2108
# testgcpkms-fail-task runs in a non-GCE environment.
@@ -2119,7 +2120,7 @@ tasks:
2119
2120
PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
2120
2121
make build-kms-test
2121
2122
echo "Building build-kms-test ... end"
2122
- LD_LIBRARY_PATH=./install/libmongocrypt/lib \
2123
+ LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
2123
2124
MONGODB_URI='mongodb://localhost:27017/' \
2124
2125
EXPECT_ERROR='unable to retrieve GCP credentials' \
2125
2126
PROVIDER='gcp' \
@@ -2143,7 +2144,7 @@ tasks:
2143
2144
export AWS_ACCESS_KEY_ID="${cse_aws_access_key_id}"
2144
2145
export AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}"
2145
2146
2146
- LD_LIBRARY_PATH=./install/libmongocrypt/lib \
2147
+ LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
2147
2148
MONGODB_URI='${atlas_free_tier_uri}' \
2148
2149
PROVIDER='aws' \
2149
2150
./testkms
@@ -2165,9 +2166,9 @@ tasks:
2165
2166
make build-kms-test
2166
2167
echo "Building build-kms-test ... end"
2167
2168
2168
- LD_LIBRARY_PATH=./install/libmongocrypt/lib \
2169
+ LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
2169
2170
MONGODB_URI='${atlas_free_tier_uri}' \
2170
- EXPECT_ERROR='unable to retrieve aws credentials ' \
2171
+ EXPECT_ERROR='status=400 ' \
2171
2172
PROVIDER='aws' \
2172
2173
./testkms
2173
2174
@@ -2191,7 +2192,7 @@ tasks:
2191
2192
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
2192
2193
echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2193
2194
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2194
- tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib /libmongocrypt.*
2195
+ tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64 /libmongocrypt.*
2195
2196
AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
2196
2197
echo "Copying files ... end"
2197
2198
echo "Untarring file ... begin"
@@ -2209,7 +2210,7 @@ tasks:
2209
2210
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
2210
2211
echo '${testazurekms_privatekey}' > /tmp/testazurekms.prikey
2211
2212
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms.prikey
2212
- AZUREKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib MONGODB_URI='mongodb://localhost:27017' PROVIDER='azure' AZUREKMS_KEY_NAME='${AZUREKMS_KEY_NAME}' AZUREKMS_KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
2213
+ AZUREKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib64 MONGODB_URI='mongodb://localhost:27017' PROVIDER='azure' AZUREKMS_KEY_NAME='${AZUREKMS_KEY_NAME}' AZUREKMS_KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
2213
2214
2214
2215
- name : " testazurekms-fail-task"
2215
2216
# testazurekms-fail-task runs without environment variables.
@@ -2228,7 +2229,7 @@ tasks:
2228
2229
make build-kms-test
2229
2230
echo "Building build-kms-test ... end"
2230
2231
2231
- LD_LIBRARY_PATH=./install/libmongocrypt/lib \
2232
+ LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
2232
2233
MONGODB_URI='mongodb://localhost:27017' \
2233
2234
EXPECT_ERROR='unable to retrieve azure credentials' \
2234
2235
PROVIDER='azure' AZUREKMS_KEY_NAME='${AZUREKMS_KEY_NAME}' AZUREKMS_KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' \
@@ -2311,9 +2312,9 @@ axes:
2311
2312
GCC_PATH : " /cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2312
2313
GO_DIST : " C:\\ golang\\ go1.20"
2313
2314
VENV_BIN_DIR : " Scripts"
2314
- - id : " ubuntu1604 -64-go-1-20"
2315
- display_name : " Ubuntu 16.04 "
2316
- run_on : ubuntu1604-build
2315
+ - id : " rhel87 -64-go-1-20"
2316
+ display_name : " RHEL 8.7 "
2317
+ run_on : rhel8.7-large
2317
2318
variables :
2318
2319
GO_DIST : " /opt/golang/go1.20"
2319
2320
- id : " macos11-go-1-20"
@@ -2335,9 +2336,9 @@ axes:
2335
2336
GCC_PATH : " /cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2336
2337
GO_DIST : " C:\\ golang\\ go1.20"
2337
2338
VENV_BIN_DIR : " Scripts"
2338
- - id : " ubuntu1804 -64-go-1-20"
2339
- display_name : " Ubuntu 18.04 "
2340
- run_on : ubuntu1804-build
2339
+ - id : " rhel87 -64-go-1-20"
2340
+ display_name : " RHEL 8.7 "
2341
+ run_on : rhel8.7-large
2341
2342
variables :
2342
2343
GO_DIST : " /opt/golang/go1.20"
2343
2344
- id : " macos11-go-1-20"
@@ -2347,13 +2348,12 @@ axes:
2347
2348
variables :
2348
2349
GO_DIST : " /opt/golang/go1.20"
2349
2350
2350
- # OCSP linux tasks need to run against this OS since stapling is disabled on Ubuntu 18.04 (SERVER-51364)
2351
- - id : ocsp-rhel-70
2351
+ - id : ocsp-rhel-87
2352
2352
display_name : OS
2353
2353
values :
2354
- - id : " rhel70 -go-1-20"
2355
- display_name : " RHEL 7.0 "
2356
- run_on : rhel70-build
2354
+ - id : " rhel87 -go-1-20"
2355
+ display_name : " RHEL 8.7 "
2356
+ run_on : rhel8.7-large
2357
2357
variables :
2358
2358
GO_DIST : " /opt/golang/go1.20"
2359
2359
@@ -2368,6 +2368,8 @@ axes:
2368
2368
GCC_PATH : " /cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2369
2369
GO_DIST : " C:\\ golang\\ go1.20"
2370
2370
SKIP_ECS_AUTH_TEST : true
2371
+ # TODO(BUILD-17329): Update this to Ubuntu 22 after we add a new ECS task
2372
+ # definition.
2371
2373
- id : " ubuntu1804-64-go-1-20"
2372
2374
display_name : " Ubuntu 18.04"
2373
2375
run_on : ubuntu1804-test
@@ -2386,18 +2388,18 @@ axes:
2386
2388
- id : os-faas-80
2387
2389
display_name : OS
2388
2390
values :
2389
- - id : " rhel80 -large-go-1-20"
2390
- display_name : " RHEL 8.0 "
2391
- run_on : rhel80 -large
2391
+ - id : " rhel87 -large-go-1-20"
2392
+ display_name : " RHEL 8.7 "
2393
+ run_on : rhel8.7 -large
2392
2394
variables :
2393
2395
GO_DIST : " /opt/golang/go1.20"
2394
2396
2395
2397
- id : os-serverless
2396
2398
display_name : OS
2397
2399
values :
2398
- - id : " ubuntu2204 -go-1-20"
2399
- display_name : " Ubuntu 22.04 "
2400
- run_on : ubuntu2204 -small
2400
+ - id : " rhel87 -go-1-20"
2401
+ display_name : " RHEL 8.7 "
2402
+ run_on : rhel8.7 -small
2401
2403
variables :
2402
2404
GO_DIST : " /opt/golang/go1.20"
2403
2405
@@ -2620,7 +2622,7 @@ buildvariants:
2620
2622
- name : static-analysis
2621
2623
display_name : " Static Analysis"
2622
2624
run_on :
2623
- - ubuntu1804-build
2625
+ - rhel8.7-large
2624
2626
expansions :
2625
2627
GO_DIST : " /opt/golang/go1.20"
2626
2628
tasks :
@@ -2629,7 +2631,7 @@ buildvariants:
2629
2631
- name : perf
2630
2632
display_name : " Performance"
2631
2633
run_on :
2632
- - ubuntu1804-build
2634
+ - rhel8.7-large
2633
2635
expansions :
2634
2636
GO_DIST : " /opt/golang/go1.20"
2635
2637
tasks :
@@ -2638,16 +2640,16 @@ buildvariants:
2638
2640
- name : build-check
2639
2641
display_name : " Compile Only Checks"
2640
2642
run_on :
2641
- - ubuntu1804-test
2643
+ - rhel8.7-large
2642
2644
expansions :
2643
2645
GO_DIST : " /opt/golang/go1.20"
2644
2646
tasks :
2645
2647
- name : " .compile-check"
2646
-
2648
+
2647
2649
- name : atlas-test
2648
2650
display_name : " Atlas test"
2649
2651
run_on :
2650
- - ubuntu1804-build
2652
+ - rhel8.7-large
2651
2653
expansions :
2652
2654
GO_DIST : " /opt/golang/go1.20"
2653
2655
tasks :
@@ -2656,7 +2658,7 @@ buildvariants:
2656
2658
- name : atlas-data-lake-test
2657
2659
display_name : " Atlas Data Lake Test"
2658
2660
run_on :
2659
- - ubuntu1804-build
2661
+ - rhel8.7-large
2660
2662
expansions :
2661
2663
GO_DIST : " /opt/golang/go1.20"
2662
2664
tasks :
@@ -2693,8 +2695,8 @@ buildvariants:
2693
2695
- name : " aws-auth-test"
2694
2696
2695
2697
- matrix_name : " ocsp-test"
2696
- matrix_spec : { version: ["4.4", "5.0", "6.0", "7.0", "latest"], ocsp-rhel-70 : ["rhel70 -go-1-20"] }
2697
- display_name : " OCSP ${version} ${ocsp-rhel-70 }"
2698
+ matrix_spec : { version: ["4.4", "5.0", "6.0", "7.0", "latest"], ocsp-rhel-87 : ["rhel87 -go-1-20"] }
2699
+ display_name : " OCSP ${version} ${ocsp-rhel-87 }"
2698
2700
batchtime : 20160 # Use a batchtime of 14 days as suggested by the OCSP test README
2699
2701
tasks :
2700
2702
- name : " .ocsp"
@@ -2716,7 +2718,7 @@ buildvariants:
2716
2718
- name : " .ocsp-rsa !.ocsp-staple"
2717
2719
2718
2720
- matrix_name : " race-test"
2719
- matrix_spec : { version: ["latest"], os-ssl-40: ["ubuntu1804 -64-go-1-20"] }
2721
+ matrix_spec : { version: ["latest"], os-ssl-40: ["rhel87 -64-go-1-20"] }
2720
2722
display_name : " Race Detector Test"
2721
2723
tasks :
2722
2724
- name : " .race"
@@ -2728,14 +2730,13 @@ buildvariants:
2728
2730
- name : " .versioned-api"
2729
2731
2730
2732
- matrix_name : " kms-tls-test"
2731
- matrix_spec : { version: ["latest"], os-ssl-40: ["ubuntu1804 -64-go-1-20"] }
2733
+ matrix_spec : { version: ["latest"], os-ssl-40: ["rhel87 -64-go-1-20"] }
2732
2734
display_name : " KMS TLS ${os-ssl-40}"
2733
2735
tasks :
2734
2736
- name : " .kms-tls"
2735
2737
2736
2738
- matrix_name : " load-balancer-test"
2737
- # The LB software is only available on Ubuntu 18.04, so we don't test on all OSes.
2738
- matrix_spec : { version: ["5.0", "6.0", "7.0", "latest", "rapid"], os-ssl-40: ["ubuntu1804-64-go-1-20"] }
2739
+ matrix_spec : { version: ["5.0", "6.0", "7.0", "latest", "rapid"], os-ssl-40: ["rhel87-64-go-1-20"] }
2739
2740
display_name : " Load Balancer Support ${version} ${os-ssl-40}"
2740
2741
tasks :
2741
2742
- name : " .load-balancer"
@@ -2747,28 +2748,28 @@ buildvariants:
2747
2748
- " serverless_task_group"
2748
2749
2749
2750
- matrix_name : " kms-kmip-test"
2750
- matrix_spec : { version: ["latest"], os-ssl-40: ["ubuntu1804 -64-go-1-20"] }
2751
+ matrix_spec : { version: ["latest"], os-ssl-40: ["rhel87 -64-go-1-20"] }
2751
2752
display_name : " KMS KMIP ${os-ssl-40}"
2752
2753
tasks :
2753
2754
- name : " .kms-kmip"
2754
2755
2755
2756
- matrix_name : " fuzz-test"
2756
- matrix_spec : { version: ["5.0"], os-ssl-40: ["ubuntu1804 -64-go-1-20"] }
2757
+ matrix_spec : { version: ["5.0"], os-ssl-40: ["rhel87 -64-go-1-20"] }
2757
2758
display_name : " Fuzz ${version} ${os-ssl-40}"
2758
2759
tasks :
2759
2760
- name : " test-fuzz"
2760
2761
batchtime : 1440 # Run at most once per 24 hours.
2761
2762
2762
2763
- matrix_name : " faas-test"
2763
- matrix_spec : { version: ["latest"], os-faas-80: ["rhel80 -large-go-1-20"] }
2764
+ matrix_spec : { version: ["latest"], os-faas-80: ["rhel87 -large-go-1-20"] }
2764
2765
display_name : " FaaS ${version} ${os-faas-80}"
2765
2766
tasks :
2766
2767
- test-aws-lambda-task-group
2767
2768
2768
2769
- name : testgcpkms-variant
2769
2770
display_name : " GCP KMS"
2770
2771
run_on :
2771
- - debian11 -small
2772
+ - rhel8.7 -small
2772
2773
expansions :
2773
2774
GO_DIST : " /opt/golang/go1.20"
2774
2775
tasks :
@@ -2779,7 +2780,7 @@ buildvariants:
2779
2780
- name : testawskms-variant
2780
2781
display_name : " AWS KMS"
2781
2782
run_on :
2782
- - debian11 -small
2783
+ - rhel8.7 -small
2783
2784
expansions :
2784
2785
GO_DIST : " /opt/golang/go1.20"
2785
2786
tasks :
@@ -2789,7 +2790,7 @@ buildvariants:
2789
2790
- name : testazurekms-variant
2790
2791
display_name : " AZURE KMS"
2791
2792
run_on :
2792
- - debian11 -small
2793
+ - rhel8.7 -small
2793
2794
expansions :
2794
2795
GO_DIST : " /opt/golang/go1.20"
2795
2796
tasks :
0 commit comments