Skip to content

Commit 61be7c6

Browse files
authored
Revert ubuntu (#3037)
1 parent dc3a1b0 commit 61be7c6

File tree

4 files changed

+50
-45
lines changed

4 files changed

+50
-45
lines changed

build/ci/repo_config.yaml

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,19 @@ repos:
195195
repos:
196196
- apt/ubuntu/dists/jammy/mongodb-org
197197

198-
- name: ubuntu2404
199-
type: deb
200-
code_name: "noble"
201-
edition: org
202-
bucket: repo.mongodb.org
203-
component: multiverse
204-
architectures:
205-
- amd64
206-
- s390x
207-
- arm64
208-
repos:
209-
- apt/ubuntu/dists/noble/mongodb-org
198+
# TODO: CLOUDP-246693: Add Ubuntu 24.04
199+
# - name: ubuntu2404
200+
# type: deb
201+
# code_name: "noble"
202+
# edition: org
203+
# bucket: repo.mongodb.org
204+
# component: multiverse
205+
# architectures:
206+
# - amd64
207+
# - s390x
208+
# - arm64
209+
# repos:
210+
# - apt/ubuntu/dists/noble/mongodb-org
210211

211212

212213
####################
@@ -353,17 +354,17 @@ repos:
353354
- arm64
354355
repos:
355356
- apt/ubuntu/dists/jammy/mongodb-enterprise
356-
357-
- name: ubuntu2404
358-
type: deb
359-
code_name: "noble"
360-
edition: enterprise
361-
bucket: repo.mongodb.com
362-
component: multiverse
363-
architectures:
364-
- amd64
365-
- ppc64el
366-
- s390x
367-
- arm64
368-
repos:
369-
- apt/ubuntu/dists/noble/mongodb-enterprise
357+
# TODO: CLOUDP-246693: Add Ubuntu 24.04
358+
# - name: ubuntu2404
359+
# type: deb
360+
# code_name: "noble"
361+
# edition: enterprise
362+
# bucket: repo.mongodb.com
363+
# component: multiverse
364+
# architectures:
365+
# - amd64
366+
# - ppc64el
367+
# - s390x
368+
# - arm64
369+
# repos:
370+
# - apt/ubuntu/dists/noble/mongodb-enterprise

tools/genevergreen/generate/generate.go

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ var (
4242
"debian12",
4343
"ubuntu20.04",
4444
"ubuntu22.04",
45-
"ubuntu24.04",
45+
// TODO: CLOUDP-246693: Add Ubuntu 24.04
46+
// "ubuntu24.04",
4647
}
4748
repos = []string{"org", "enterprise"}
4849
postPkgImg = map[string]string{
@@ -52,19 +53,21 @@ var (
5253
"amazonlinux2": "amazonlinux2-rpm",
5354
"ubuntu20.04": "ubuntu20.04-deb",
5455
"ubuntu22.04": "ubuntu22.04-deb",
55-
"ubuntu24.04": "ubuntu24.04-deb",
56-
"debian10": "debian10-deb",
57-
"debian11": "debian11-deb",
58-
"debian12": "debian12-deb",
56+
// TODO: CLOUDP-246693: Add Ubuntu 24.04
57+
// "ubuntu24.04": "ubuntu24.04-deb",
58+
"debian10": "debian10-deb",
59+
"debian11": "debian11-deb",
60+
"debian12": "debian12-deb",
5961
}
6062
newOs = map[string]string{
61-
"centos7": "rhel70",
62-
"centos8": "rhel80",
63-
"rhel9": "rhel90",
64-
"amazonlinux2": "amazon2",
65-
"ubuntu20.04": "ubuntu2004",
66-
"ubuntu22.04": "ubuntu2204",
67-
"ubuntu24.04": "ubuntu2404",
63+
"centos7": "rhel70",
64+
"centos8": "rhel80",
65+
"rhel9": "rhel90",
66+
"amazonlinux2": "amazon2",
67+
"ubuntu20.04": "ubuntu2004",
68+
"ubuntu22.04": "ubuntu2204",
69+
// TODO: CLOUDP-246693: Add Ubuntu 24.04
70+
// "ubuntu24.04": "ubuntu2404",
6871
"debian10": "debian10",
6972
"debian11": "debian11",
7073
"debian12": "debian12",
@@ -216,7 +219,7 @@ func PublishSnapshotTasks(c *shrub.Configuration) {
216219
publishVariant(
217220
c,
218221
v,
219-
"8.0",
222+
"5.0",
220223
"",
221224
dependency,
222225
false,

tools/genevergreen/generate/generate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
func TestPublishSnapshotTasks(t *testing.T) {
2727
c := &shrub.Configuration{}
2828
PublishSnapshotTasks(c)
29-
assert.Len(t, c.Tasks, 42)
29+
assert.Len(t, c.Tasks, 38)
3030
assert.Len(t, c.Variants, 2)
3131
}
3232

3333
func TestPublishStableTasks(t *testing.T) {
3434
c := &shrub.Configuration{}
3535
PublishStableTasks(c)
3636
assert.Len(t, c.Variants, 4)
37-
assert.Len(t, c.Tasks, 168)
37+
assert.Len(t, c.Tasks, 152)
3838
}

tools/genevergreen/generate/publish.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ var distros = map[string]Platform{
7676
extension: deb,
7777
architectures: []string{x86_64, arm64},
7878
},
79-
"ubuntu2404": {
80-
extension: deb,
81-
architectures: []string{x86_64, arm64},
82-
},
79+
// TODO: CLOUDP-246693: Add Ubuntu 24.04
80+
// "ubuntu2404": {
81+
// extension: deb,
82+
// architectures: []string{x86_64, arm64},
83+
// },
8384
}
8485

8586
func newPublishTask(taskName, extension, edition, distro, taskServerVersion, notaryKey, arch string, stable bool, dependency []shrub.TaskDependency) *shrub.Task {

0 commit comments

Comments
 (0)