@@ -259,7 +259,7 @@ functions:
259259 " upload test results " :
260260 - command : attach.xunit_results
261261 params :
262- file : ./src/tmp/ rspec.xml
262+ file : ./src/rspec.xml
263263
264264 " run tests " :
265265 - command : shell.exec
@@ -308,7 +308,7 @@ post:
308308 # Removed, causing timeouts
309309 # - func: "upload working dir"
310310 - func : " upload mo artifacts"
311- # - func: "upload test results"
311+ # - func: "upload test results"
312312 - func : " upload test results to s3"
313313
314314task_groups :
@@ -472,6 +472,10 @@ axes:
472472 display_name : ruby-3.2
473473 variables :
474474 RVM_RUBY : " ruby-3.2"
475+ - id : " ruby-3.3"
476+ display_name : ruby-3.3
477+ variables :
478+ RVM_RUBY : " ruby-3.3"
475479 - id : " ruby-head"
476480 display_name : ruby-head
477481 variables :
@@ -491,6 +495,11 @@ axes:
491495 - id : actual-ubuntu-22.04
492496 display_name : " Ubuntu 22.04"
493497 run_on : ubuntu2204-small
498+ - id : ubuntu-18.04
499+ display_name : " Ubuntu 18.04"
500+ run_on : ubuntu2004-small
501+ variables :
502+ DOCKER_DISTRO : ubuntu1804
494503 - id : ubuntu-20.04
495504 display_name : " Ubuntu 20.04"
496505 run_on : ubuntu2004-small
@@ -587,6 +596,10 @@ axes:
587596 display_name : " Rails 7.2"
588597 variables :
589598 RAILS : " 7.2"
599+ - id : " 8.0"
600+ display_name : " Rails 8.0"
601+ variables :
602+ RAILS : " 8.0"
590603
591604 - id : " test-i18n-fallbacks"
592605 display_name : Test i18n fallbacks
@@ -655,7 +668,7 @@ buildvariants:
655668 driver : ["current"]
656669 topology : ['replica-set']
657670 mongodb-version : ['5.0']
658- os : rhel80
671+ os : ubuntu-20.04
659672 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
660673 tasks :
661674 - name : " test"
@@ -666,7 +679,7 @@ buildvariants:
666679 driver : ["current"]
667680 topology : ' *'
668681 mongodb-version : ['4.4']
669- os : rhel80
682+ os : ubuntu-20.04
670683 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
671684 tasks :
672685 - name : " test"
@@ -688,7 +701,7 @@ buildvariants:
688701 ruby : ["ruby-2.7"]
689702 mongodb-version : " 4.0"
690703 topology : ['replica-set', 'sharded-cluster']
691- os : rhel80
704+ os : ubuntu-20.04
692705 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
693706 tasks :
694707 - name : " test"
@@ -697,33 +710,20 @@ buildvariants:
697710 matrix_spec :
698711 driver : [min]
699712 ruby : ["ruby-2.7"]
700- mongodb-version : " 3.6 "
713+ mongodb-version : " 5.0 "
701714 topology : " standalone"
702- os : rhel80
715+ os : ubuntu-20.04
703716 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
704717 tasks :
705718 - name : " test"
706719
707- - matrix_name : " rails-7"
708- matrix_spec :
709- ruby : ["ruby-3.2"]
710- driver : ["current"]
711- mongodb-version : " 6.0"
712- topology : " standalone"
713- rails : ['7.0', '7.1', '7.2']
714- os : ubuntu-22.04
715- fle : helper
716- display_name : " ${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
717- tasks :
718- - name : " test"
719-
720720- matrix_name : " bson-min"
721721 matrix_spec :
722722 driver : [bson-min]
723723 ruby : ["ruby-2.7"]
724724 mongodb-version : " 5.0"
725725 topology : " standalone"
726- os : rhel80
726+ os : ubuntu-20.04
727727 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
728728 tasks :
729729 - name : " test"
@@ -734,11 +734,49 @@ buildvariants:
734734 ruby : ["ruby-3.0"]
735735 mongodb-version : " 5.0"
736736 topology : " standalone"
737- os : rhel80
737+ os : ubuntu-20.04
738738 display_name : " ${ruby}, ${driver}, ${mongodb-version}, ${topology}"
739739 tasks :
740740 - name : " test"
741741
742+ - matrix_name : " rails-master"
743+ matrix_spec :
744+ ruby : ["ruby-3.2"]
745+ driver : ["current"]
746+ mongodb-version : " 7.0"
747+ topology : " standalone"
748+ rails : ['master']
749+ os : ubuntu-22.04
750+ fle : helper
751+ display_name : " ${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
752+ tasks :
753+ - name : " test"
754+
755+ - matrix_name : " rails-8"
756+ matrix_spec :
757+ ruby : ["ruby-3.3"]
758+ driver : ["current"]
759+ mongodb-version : " 7.0"
760+ topology : " standalone"
761+ rails : ['8.0']
762+ os : ubuntu-22.04
763+ fle : helper
764+ display_name : " ${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
765+ tasks :
766+ - name : " test"
767+
768+ - matrix_name : " rails-7"
769+ matrix_spec :
770+ ruby : ["ruby-3.2"]
771+ driver : ["current"]
772+ mongodb-version : " 6.0"
773+ topology : " standalone"
774+ rails : ['7.0', '7.1', '7.2']
775+ os : ubuntu-22.04
776+ fle : helper
777+ display_name : " ${rails}, ${driver}, ${mongodb-version} (FLE ${fle})"
778+ tasks :
779+ - name : " test"
742780
743781- matrix_name : " rails-6"
744782 matrix_spec :
@@ -747,7 +785,7 @@ buildvariants:
747785 mongodb-version : " 6.0"
748786 topology : " standalone"
749787 rails : ['6.0', '6.1']
750- os : rhel80
788+ os : ubuntu-20.04
751789 display_name : " ${rails}, ${driver}, ${mongodb-version}"
752790 tasks :
753791 - name : " test"
@@ -756,36 +794,49 @@ buildvariants:
756794 matrix_spec :
757795 ruby : " ruby-2.7"
758796 driver : ["current"]
759- mongodb-version : " 4.2 "
797+ mongodb-version : " 5.0 "
760798 topology : " standalone"
761799 test-i18n-fallbacks : yes
762- os : rhel80
800+ os : ubuntu-20.04
763801 display_name : " i18n fallbacks ${rails}, ${driver}, ${mongodb-version}"
764802 tasks :
765803 - name : " test"
766804
805+ - matrix_name : app-tests-rails-8
806+ matrix_spec :
807+ ruby : ["ruby-3.2"]
808+ driver : ["current"]
809+ mongodb-version : ' 7.0'
810+ topology : standalone
811+ app-tests : yes
812+ rails : ['8.0']
813+ os : ubuntu-22.04
814+ display_name : " app tests ${driver}, ${ruby}, ${rails}"
815+ tasks :
816+ - name : " test"
817+
767818- matrix_name : app-tests-rails-7
768819 matrix_spec :
769- ruby : ["ruby-3.1", "ruby-3. 2"]
820+ ruby : ["ruby-3.2"]
770821 driver : ["current"]
771822 mongodb-version : ' 6.0'
772823 topology : standalone
773824 app-tests : yes
774- rails : ['6.1', ' 7.0', '7.1', '7.2']
775- os : ubuntu-20 .04
825+ rails : ['7.0', '7.1', '7.2']
826+ os : ubuntu-22 .04
776827 display_name : " app tests ${driver}, ${ruby}, ${rails}"
777828 tasks :
778829 - name : " test"
779830
780- - matrix_name : app-tests-rails-6-0
831+ - matrix_name : app-tests-rails-6
781832 matrix_spec :
782833 ruby : ["ruby-2.7"]
783834 driver : ["current"]
784835 mongodb-version : ' 5.0'
785836 topology : standalone
786837 app-tests : yes
787- rails : ['6.0']
788- os : rhel80
838+ rails : ['6.0', '6.1' ]
839+ os : ubuntu-20.04
789840 display_name : " app tests ${driver}, ${ruby}, ${rails}"
790841 tasks :
791842 - name : " test"
0 commit comments