@@ -452,6 +452,7 @@ functions:
452
452
fi
453
453
if [ -n "${test_crypt_shared}" ]; then
454
454
export TEST_CRYPT_SHARED=1
455
+ export CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH}
455
456
fi
456
457
if [ -n "${test_pyopenssl}" ]; then
457
458
export TEST_PYOPENSSL=1
@@ -2497,6 +2498,7 @@ axes:
2497
2498
variables :
2498
2499
test_encryption : true
2499
2500
batchtime : 10080 # 7 days
2501
+ # The path to crypt_shared is stored in the $CRYPT_SHARED_LIB_PATH expansion.
2500
2502
- id : " encryption_crypt_shared"
2501
2503
display_name : " Encryption shared lib"
2502
2504
tags : ["encryption_tag"]
@@ -2634,19 +2636,6 @@ buildvariants:
2634
2636
- " .4.4"
2635
2637
- " .4.2"
2636
2638
- " .4.0"
2637
- rules : &encryption-exclude-rules
2638
- - if :
2639
- platform : " *"
2640
- auth : " *"
2641
- ssl : " *"
2642
- encryption : [ "encryption_crypt_shared" ]
2643
- then :
2644
- remove_tasks :
2645
- - " .rapid"
2646
- - " .5.0"
2647
- - " .4.4"
2648
- - " .4.2"
2649
- - " .4.0"
2650
2639
2651
2640
# Test one server version with zSeries, POWER8, and ARM.
2652
2641
- matrix_name : " test-different-cpu-architectures"
@@ -2729,19 +2718,6 @@ buildvariants:
2729
2718
encryption : " *"
2730
2719
display_name : " ${encryption} ${python-version} ${platform} ${auth-ssl}"
2731
2720
tasks : *encryption-server-versions
2732
- rules :
2733
- - if :
2734
- platform : " *"
2735
- python-version : " *"
2736
- auth-ssl : " *"
2737
- encryption : [ "encryption_crypt_shared" ]
2738
- then :
2739
- remove_tasks :
2740
- - " .rapid"
2741
- - " .5.0"
2742
- - " .4.4"
2743
- - " .4.2"
2744
- - " .4.0"
2745
2721
2746
2722
2747
2723
- matrix_name : " tests-python-version-ubuntu18-without-c-extensions"
@@ -2853,19 +2829,6 @@ buildvariants:
2853
2829
encryption : " *"
2854
2830
display_name : " ${encryption} ${platform} ${python-version-windows} ${auth-ssl}"
2855
2831
tasks : *encryption-server-versions
2856
- rules :
2857
- - if :
2858
- platform : " *"
2859
- python-version-windows : " *"
2860
- auth-ssl : " *"
2861
- encryption : [ "encryption_crypt_shared" ]
2862
- then :
2863
- remove_tasks :
2864
- - " .rapid"
2865
- - " .5.0"
2866
- - " .4.4"
2867
- - " .4.2"
2868
- - " .4.0"
2869
2832
2870
2833
# Storage engine tests on Ubuntu 18.04 (x86_64) with Python 3.7.
2871
2834
- matrix_name : " tests-storage-engines"
0 commit comments