Skip to content

Commit 58fc73a

Browse files
committed
JAVA-2638: Add more host types to run on in Evergreen
1 parent df3a400 commit 58fc73a

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

.evergreen/.evg.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,15 @@ functions:
306306
file="${PROJECT_DIRECTORY}/.evergreen/install-dependencies.sh"
307307
[ -f ${file} ] && sh ${file} || echo "${file} not available, skipping"
308308
309+
# Anchors
310+
311+
hosts: &hosts
312+
- rhel62-small
313+
- rhel70-small
314+
- ubuntu1404-test
315+
- ubuntu1604-test
316+
- debian81-test
317+
309318
pre:
310319
- func: "fetch source"
311320
- func: "prepare resources"
@@ -392,9 +401,9 @@ axes:
392401
- id: os
393402
display_name: OS
394403
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
398407

399408
- id: topology
400409
display_name: Topology
@@ -465,20 +474,19 @@ buildvariants:
465474
# Test packaging and other release related routines
466475
- name: static-checks
467476
display_name: "Static Checks"
468-
run_on:
469-
- rhel62-test
477+
run_on: *hosts
470478
tasks:
471479
- name: "static-analysis"
472480

473481
- 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" }
475483
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
476484
tags: ["tests-variant"]
477485
tasks:
478486
- name: "test"
479487

480488
- 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" }
482490
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
483491
tags: ["tests-variant"]
484492
tasks:
@@ -499,30 +507,28 @@ buildvariants:
499507
- name: "test"
500508

501509
- 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" }
503511
exclude_spec: { jdk: "jdk6", auth: "*", ssl: "*", version: "*", topology: "*", os: "*" }
504512
display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
505513
tags: ["tests-variant"]
506514
tasks:
507515
- name: "test"
508516

509517
- matrix_name: "test-gssapi"
510-
matrix_spec: { jdk: "*", os: "rhel62" }
518+
matrix_spec: { jdk: "*", os: "linux" }
511519
display_name: "GSSAPI (Kerberos) Auth test ${jdk} ${os} "
512520
tags: ["test-gssapi-variant"]
513521
tasks:
514522
- name: "gssapi-auth-test"
515523

516524
- name: plain-auth-test
517525
display_name: "PLAIN (LDAP) Auth test"
518-
run_on:
519-
- rhel62-test
526+
run_on: *hosts
520527
tasks:
521528
- name: "plain-auth-test"
522529

523530
- name: publish-snapshot
524531
display_name: "Publish Snapshot"
525-
run_on:
526-
- rhel62-test
532+
run_on: *hosts
527533
tasks:
528534
- name: "publish-snapshot"

0 commit comments

Comments
 (0)