@@ -306,6 +306,15 @@ functions:
306
306
file="${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
307
307
[ -f ${file} ] && sh ${file} || echo "${file} not available, skipping"
308
308
309
+ # Anchors
310
+
311
+ hosts : &hosts
312
+ - rhel62-small
313
+ - rhel70-small
314
+ - ubuntu1404-test
315
+ - ubuntu1604-test
316
+ - debian81-test
317
+
309
318
pre :
310
319
- func : " fetch source"
311
320
- func : " prepare resources"
@@ -392,9 +401,9 @@ axes:
392
401
- id : os
393
402
display_name : OS
394
403
values :
395
- - id : " rhel62 "
396
- display_name : " RHEL 6.2 "
397
- run_on : rhel62-test
404
+ - id : " linux "
405
+ display_name : " Linux "
406
+ run_on : *hosts
398
407
399
408
- id : topology
400
409
display_name : Topology
@@ -465,20 +474,19 @@ buildvariants:
465
474
# Test packaging and other release related routines
466
475
- name : static-checks
467
476
display_name : " Static Checks"
468
- run_on :
469
- - rhel62-test
477
+ run_on : *hosts
470
478
tasks :
471
479
- name : " static-analysis"
472
480
473
481
- matrix_name : " tests-zlib-compression"
474
- matrix_spec : { compressor : "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk6", version: ["latest"], topology: "standalone", os: "rhel62 " }
482
+ matrix_spec : { compressor : "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk6", version: ["latest"], topology: "standalone", os: "linux " }
475
483
display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
476
484
tags : ["tests-variant"]
477
485
tasks :
478
486
- name : " test"
479
487
480
488
- matrix_name : " tests-snappy-compression"
481
- matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["3.4", "latest"], topology: "standalone", os: "rhel62 " }
489
+ matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["3.4", "latest"], topology: "standalone", os: "linux " }
482
490
display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
483
491
tags : ["tests-variant"]
484
492
tasks :
@@ -499,30 +507,28 @@ buildvariants:
499
507
- name : " test"
500
508
501
509
- matrix_name : " tests-jdk-other"
502
- matrix_spec : { auth: "auth", ssl: "ssl", jdk: "*", version: "3.4", topology: "standalone", os: "rhel62 " }
510
+ matrix_spec : { auth: "auth", ssl: "ssl", jdk: "*", version: "3.4", topology: "standalone", os: "linux " }
503
511
exclude_spec : { jdk: "jdk6", auth: "*", ssl: "*", version: "*", topology: "*", os: "*" }
504
512
display_name : " ${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
505
513
tags : ["tests-variant"]
506
514
tasks :
507
515
- name : " test"
508
516
509
517
- matrix_name : " test-gssapi"
510
- matrix_spec : { jdk: "*", os: "rhel62 " }
518
+ matrix_spec : { jdk: "*", os: "linux " }
511
519
display_name : " GSSAPI (Kerberos) Auth test ${jdk} ${os} "
512
520
tags : ["test-gssapi-variant"]
513
521
tasks :
514
522
- name : " gssapi-auth-test"
515
523
516
524
- name : plain-auth-test
517
525
display_name : " PLAIN (LDAP) Auth test"
518
- run_on :
519
- - rhel62-test
526
+ run_on : *hosts
520
527
tasks :
521
528
- name : " plain-auth-test"
522
529
523
530
- name : publish-snapshot
524
531
display_name : " Publish Snapshot"
525
- run_on :
526
- - rhel62-test
532
+ run_on : *hosts
527
533
tasks :
528
534
- name : " publish-snapshot"
0 commit comments