Skip to content

Commit b2669c6

Browse files
Fix configurations
1 parent 044bb15 commit b2669c6

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

.evergreen/config.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ buildvariants:
922922
- matrix_name: "mongo-5.0"
923923
matrix_spec:
924924
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
925-
ruby: ["ruby-2.7"]
925+
ruby: ["ruby-3.1", "ruby-2.7"]
926926
mongodb-version: '5.0'
927927
topology: '*'
928928
os: ubuntu1804
@@ -933,19 +933,19 @@ buildvariants:
933933
- matrix_name: "single-lb"
934934
matrix_spec:
935935
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
936-
ruby: ["ruby-2.7"]
936+
ruby: ["ruby-3.0"]
937937
mongodb-version: '5.0'
938938
topology: load-balanced
939939
single-mongos: single-mongos
940-
os: ubuntu1804
940+
os: ubuntu2004
941941
display_name: "${mongodb-version} ${topology} single-lb ${auth-and-ssl} ${ruby}"
942942
tasks:
943943
- name: "test-mlaunch"
944944

945945
- matrix_name: "mongo-5.0-api-version"
946946
matrix_spec:
947947
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
948-
ruby: ["ruby-2.7"]
948+
ruby: ["ruby-3.1"]
949949
mongodb-version: '5.0'
950950
topology: standalone
951951
api-version-required: yes
@@ -1002,10 +1002,10 @@ buildvariants:
10021002
- matrix_name: "lint-5.0"
10031003
matrix_spec:
10041004
lint: on
1005-
ruby: "ruby-2.7"
1005+
ruby: ["ruby-3.1", "ruby-2.7"]
10061006
mongodb-version: ["5.0"]
10071007
topology: '*'
1008-
os: ubuntu1804
1008+
os: ubuntu2004
10091009
display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
10101010
tasks:
10111011
- name: "test-mlaunch"
@@ -1024,7 +1024,7 @@ buildvariants:
10241024
- matrix_name: "solo"
10251025
matrix_spec:
10261026
solo: on
1027-
ruby: [ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2]
1027+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7, ruby-2.6, ruby-2.5, jruby-9.2]
10281028
mongodb-version: ["4.4"]
10291029
topology: ["standalone", "replica-set", "sharded-cluster"]
10301030
os: ubuntu1604
@@ -1060,7 +1060,7 @@ buildvariants:
10601060
ruby: "jruby-9.2"
10611061
mongodb-version: "4.2"
10621062
topology: ["standalone", "replica-set", "sharded-cluster"]
1063-
os: rhel70
1063+
os: rhel80
10641064
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
10651065
tasks:
10661066
- name: "test-mlaunch"
@@ -1095,7 +1095,7 @@ buildvariants:
10951095
mongodb-version: "4.4"
10961096
topology: "standalone"
10971097
compressor: 'zlib'
1098-
os: ubuntu1604
1098+
os: ubuntu2004
10991099
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
11001100
tasks:
11011101
- name: "test-mlaunch"
@@ -1124,14 +1124,14 @@ buildvariants:
11241124
tasks:
11251125
- name: "test-mlaunch"
11261126

1127-
- matrix_name: "snappy-auth-3.0"
1127+
- matrix_name: "snappy-auth-3"
11281128
matrix_spec:
11291129
auth-and-ssl: "auth-and-ssl"
1130-
ruby: ["ruby-3.0"]
1130+
ruby: ["ruby-3.1"]
11311131
mongodb-version: "4.4"
11321132
topology: "standalone"
11331133
compressor: 'snappy'
1134-
os: ubuntu1604
1134+
os: ubuntu2004
11351135
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
11361136
tasks:
11371137
- name: "test-mlaunch"
@@ -1232,11 +1232,11 @@ buildvariants:
12321232

12331233
- matrix_name: "bson"
12341234
matrix_spec:
1235-
ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
1235+
ruby: [ruby-3.1, ruby-2.7, jruby-9.2]
12361236
mongodb-version: '4.4'
12371237
topology: replica-set
12381238
bson: "*"
1239-
os: rhel70
1239+
os: rhel80
12401240
display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
12411241
tasks:
12421242
- name: "test-mlaunch"
@@ -1291,7 +1291,7 @@ buildvariants:
12911291
auth-and-ssl: "noauth-and-nossl"
12921292
# https://jira.mongodb.org/browse/RUBY-2832
12931293
# ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
1294-
ruby: [ruby-3.0, ruby-2.7]
1294+
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
12951295
topology: standalone
12961296
mongodb-version: ['4.4']
12971297
os: ubuntu1804
@@ -1306,7 +1306,7 @@ buildvariants:
13061306
ruby: [ruby-2.5]
13071307
topology: [standalone, replica-set, sharded-cluster]
13081308
mongodb-version: ["4.2"]
1309-
os: ubuntu1804
1309+
os: ubuntu1604
13101310
fle: fle
13111311
display_name: "FLE: ${topology} ${mongodb-version} ${ruby}"
13121312
tasks:
@@ -1318,7 +1318,7 @@ buildvariants:
13181318
ruby: [ruby-2.6]
13191319
topology: standalone
13201320
mongodb-version: ["4.0"]
1321-
os: ubuntu1804
1321+
os: ubuntu1604
13221322
fle: fle
13231323
display_name: "FLE: ${mongodb-version} ${ruby}"
13241324
tasks:
@@ -1338,7 +1338,7 @@ buildvariants:
13381338
- matrix_name: aws-auth-temporary
13391339
matrix_spec:
13401340
auth-and-ssl: [aws-assume-role, aws-ec2, aws-ecs]
1341-
ruby: [ruby-2.7]
1341+
ruby: [ruby-3.1]
13421342
topology: standalone
13431343
mongodb-version: '4.4'
13441344
os: ubuntu1804

.evergreen/config/standard.yml.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ buildvariants:
208208
ruby: "jruby-9.2"
209209
mongodb-version: "4.2"
210210
topology: <%= tt %>
211-
os: rhel70
211+
os: rhel80
212212
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
213213
tasks:
214214
- name: "test-mlaunch"
@@ -384,7 +384,7 @@ buildvariants:
384384
mongodb-version: '4.4'
385385
topology: replica-set
386386
bson: "*"
387-
os: rhel70
387+
os: rhel80
388388
display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
389389
tasks:
390390
- name: "test-mlaunch"
@@ -454,7 +454,7 @@ buildvariants:
454454
ruby: [ruby-2.5]
455455
topology: [standalone, replica-set, sharded-cluster]
456456
mongodb-version: ["4.2"]
457-
os: ubuntu1804
457+
os: ubuntu1604
458458
fle: fle
459459
display_name: "FLE: ${topology} ${mongodb-version} ${ruby}"
460460
tasks:
@@ -466,7 +466,7 @@ buildvariants:
466466
ruby: [ruby-2.6]
467467
topology: standalone
468468
mongodb-version: ["4.0"]
469-
os: ubuntu1804
469+
os: ubuntu1604
470470
fle: fle
471471
display_name: "FLE: ${mongodb-version} ${ruby}"
472472
tasks:

0 commit comments

Comments
 (0)