@@ -412,6 +412,10 @@ axes:
412412 display_name : " latest"
413413 variables :
414414 VERSION : " latest"
415+ - id : " 4.0"
416+ display_name : " 4.0"
417+ variables :
418+ VERSION : " 4.0"
415419 - id : " 3.6"
416420 display_name : " 3.6"
417421 variables :
@@ -517,15 +521,14 @@ buildvariants:
517521 - name : " static-analysis"
518522
519523- matrix_name : " tests-zlib-compression"
520- matrix_spec : { compressor : "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk6", version: ["3.6", "latest"], topology: "standalone", os:
521- " linux" }
524+ matrix_spec : { compressor : "zlib", auth: "noauth", ssl: "nossl", jdk: "jdk6", version: ["3.6", "4.0", "latest"], topology: "standalone", os: "linux" }
522525 display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
523526 tags : ["tests-variant"]
524527 tasks :
525528 - name : " test"
526529
527530- matrix_name : " tests-snappy-compression"
528- matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["3.4", "3.6", "latest"], topology: "standalone", os: "linux" }
531+ matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["3.4", "3.6", "4.0", " latest"], topology: "standalone", os: "linux" }
529532 display_name : " ${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
530533 tags : ["tests-variant"]
531534 tasks :
@@ -540,36 +543,35 @@ buildvariants:
540543
541544- matrix_name : " tests-jdk6-secure"
542545 matrix_spec : { auth: "auth", ssl: "ssl", jdk: "jdk6", version: "*", topology: "*", os: "*" }
543- exclude_spec : { auth: "auth", ssl: "ssl", jdk: "jdk6", version: " latest", topology: "*", os: "*" }
546+ exclude_spec : { auth: "auth", ssl: "ssl", jdk: "jdk6", version: ["4.0", " latest"] , topology: "*", os: "*" }
544547 display_name : " ${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
545548 tags : ["tests-variant"]
546549 tasks :
547550 - name : " test"
548551
549552- matrix_name : " tests-jdk8-secure"
550- matrix_spec : { auth: "auth", ssl: "ssl", jdk: "jdk8", version: ["latest"], topology: "*", os: "*" }
553+ matrix_spec : { auth: "auth", ssl: "ssl", jdk: "jdk8", version: ["4.0", " latest"], topology: "*", os: "*" }
551554 display_name : " ${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
552555 tags : ["tests-variant"]
553556 tasks :
554557 - name : " test"
555558
556- - matrix_name : " tests-jdk-other"
557- matrix_spec : { auth: "auth", ssl: "ssl", jdk: "*", version: "3.6", topology: "standalone", os: "linux" }
558- exclude_spec : { jdk: "jdk6", auth: "*", ssl: "*", version: "*", topology: "*", os: "*" }
559+ - matrix_name : " tests-jdk7-secure"
560+ matrix_spec : { auth: "auth", ssl: "ssl", jdk: "jdk7", version: "3.6", topology: "standalone", os: "linux" }
559561 display_name : " ${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
560562 tags : ["tests-variant"]
561563 tasks :
562564 - name : " test"
563565
564566- matrix_name : " tests-socket"
565- matrix_spec : { auth: "*", ssl: "nossl", jdk: "jdk8", version: "3.6" , topology: "* ", os: "linux" }
567+ matrix_spec : { auth: "*", ssl: "nossl", jdk: "jdk8", version: ["4.0"] , topology: "standalone ", os: "linux" }
566568 display_name : " Socket: ${version} ${topology} ${auth} ${jdk} ${os} "
567569 tags : ["tests-socket-variant"]
568570 tasks :
569571 - name : " socket-test"
570572
571573- matrix_name : " tests-socket-snappy-compression"
572- matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: "3.6" , topology: "standalone", os: "linux" }
574+ matrix_spec : { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk7", version: ["4.0"] , topology: "standalone", os: "linux" }
573575 display_name : " Socket: ${version} ${compressor} ${topology} ${auth} ${jdk} ${os} "
574576 tags : ["tests-socket-variant"]
575577 tasks :
0 commit comments