Skip to content

Commit a95f4a3

Browse files
committed
Remove 1804
1 parent 6475236 commit a95f4a3

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ post:
430430
# Removed, causing timeouts
431431
# - func: "upload working dir"
432432
- func: "upload mo artifacts"
433-
# - func: "upload test results"
433+
- func: "upload test results"
434434
- func: "upload test results to s3"
435435

436436
task_groups:
@@ -955,9 +955,6 @@ axes:
955955
- id: ubuntu2004
956956
display_name: "Ubuntu 20.04"
957957
run_on: ubuntu2004-small
958-
- id: ubuntu1804
959-
display_name: "Ubuntu 18.04"
960-
run_on: ubuntu1804-small
961958

962959
- id: docker-distro
963960
display_name: Docker Distro
@@ -1211,7 +1208,7 @@ buildvariants:
12111208
ruby: ["ruby-3.3", "ruby-3.2", "jruby-9.4"]
12121209
mongodb-version: ['5.0']
12131210
topology: ["standalone", "replica-set", "sharded-cluster"]
1214-
os: ubuntu1804
1211+
os: ubuntu2004
12151212
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
12161213
tasks:
12171214
- name: "test-mlaunch"
@@ -1221,7 +1218,7 @@ buildvariants:
12211218
ruby: ["ruby-3.0", "ruby-2.7"]
12221219
mongodb-version: ['4.4', '4.2', '4.0']
12231220
topology: ["standalone", "replica-set", "sharded-cluster"]
1224-
os: ubuntu1804
1221+
os: ubuntu2004
12251222
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
12261223
tasks:
12271224
- name: "test-mlaunch"
@@ -1231,7 +1228,7 @@ buildvariants:
12311228
ruby: "ruby-2.7"
12321229
mongodb-version: ['3.6']
12331230
topology: ["standalone", "replica-set", "sharded-cluster"]
1234-
os: ubuntu1804
1231+
os: ubuntu2004
12351232
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
12361233
tasks:
12371234
- name: "test-mlaunch"
@@ -1307,7 +1304,7 @@ buildvariants:
13071304
mongodb-version: ['3.6', '4.0']
13081305
topology: ["standalone", "replica-set", "sharded-cluster"]
13091306
storage-engine: mmapv1
1310-
os: ubuntu1804
1307+
os: ubuntu2004
13111308
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
13121309
tasks:
13131310
- name: "test-mlaunch"
@@ -1351,7 +1348,7 @@ buildvariants:
13511348
ruby: "ruby-2.7"
13521349
mongodb-version: ['4.2', '4.0', '3.6']
13531350
topology: replica-set
1354-
os: ubuntu1804
1351+
os: ubuntu2004
13551352
display_name: "${mongodb-version} ${topology} stress ${ruby}"
13561353
tasks:
13571354
- name: "test-mlaunch"

.evergreen/config/axes.yml.erb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,6 @@ axes:
207207
- id: ubuntu2004
208208
display_name: "Ubuntu 20.04"
209209
run_on: ubuntu2004-small
210-
- id: ubuntu1804
211-
display_name: "Ubuntu 18.04"
212-
run_on: ubuntu1804-small
213210

214211
- id: docker-distro
215212
display_name: Docker Distro

.evergreen/config/common.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ post:
427427
# Removed, causing timeouts
428428
# - func: "upload working dir"
429429
- func: "upload mo artifacts"
430-
# - func: "upload test results"
430+
- func: "upload test results"
431431
- func: "upload test results to s3"
432432

433433
task_groups:

.evergreen/config/standard.yml.erb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ buildvariants:
8888
ruby: <%= recent_rubies %>
8989
mongodb-version: ['5.0']
9090
topology: <%= topologies %>
91-
os: ubuntu1804
91+
os: ubuntu2004
9292
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
9393
tasks:
9494
- name: "test-mlaunch"
@@ -98,7 +98,7 @@ buildvariants:
9898
ruby: <%= older_rubies %>
9999
mongodb-version: ['4.4', '4.2', '4.0']
100100
topology: <%= topologies %>
101-
os: ubuntu1804
101+
os: ubuntu2004
102102
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
103103
tasks:
104104
- name: "test-mlaunch"
@@ -108,7 +108,7 @@ buildvariants:
108108
ruby: <%= supported_mri_ruby_2 %>
109109
mongodb-version: ['3.6']
110110
topology: <%= topologies %>
111-
os: ubuntu1804
111+
os: ubuntu2004
112112
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
113113
tasks:
114114
- name: "test-mlaunch"
@@ -184,7 +184,7 @@ buildvariants:
184184
mongodb-version: ['3.6', '4.0']
185185
topology: <%= topologies %>
186186
storage-engine: mmapv1
187-
os: ubuntu1804
187+
os: ubuntu2004
188188
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
189189
tasks:
190190
- name: "test-mlaunch"
@@ -228,7 +228,7 @@ buildvariants:
228228
ruby: <%= supported_mri_ruby_2 %>
229229
mongodb-version: ['4.2', '4.0', '3.6']
230230
topology: replica-set
231-
os: ubuntu1804
231+
os: ubuntu2004
232232
display_name: "${mongodb-version} ${topology} stress ${ruby}"
233233
tasks:
234234
- name: "test-mlaunch"

0 commit comments

Comments
 (0)