CLOUDP-256844: Add Ubuntu 24.04 again (#3064)

mongodb · Jun 28, 2024 · a021a9f · a021a9f
1 parent f619769
commit a021a9f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 52 deletions.
diff --git a/build/ci/repo_config.yaml b/build/ci/repo_config.yaml
@@ -160,19 +160,18 @@ repos:
     repos:
       - apt/ubuntu/dists/jammy/mongodb-org
 
-  # TODO: CLOUDP-246693: Add Ubuntu 24.04
-  # - name: ubuntu2404
-  #   type: deb
-  #   code_name: "noble"
-  #   edition: org
-  #   bucket: repo.mongodb.org
-  #   component: multiverse
-  #   architectures:
-  #     - amd64
-  #     - s390x
-  #     - arm64
-  #   repos:
-  #     - apt/ubuntu/dists/noble/mongodb-org
+  - name: ubuntu2404
+    type: deb
+    code_name: "noble"
+    edition: org
+    bucket: repo.mongodb.org
+    component: multiverse
+    architectures:
+      - amd64
+      - s390x
+      - arm64
+    repos:
+      - apt/ubuntu/dists/noble/mongodb-org
 
 
   ####################
@@ -276,17 +275,17 @@ repos:
       - arm64
     repos:
       - apt/ubuntu/dists/jammy/mongodb-enterprise
-  # TODO: CLOUDP-246693: Add Ubuntu 24.04
-  # - name: ubuntu2404
-  #   type: deb
-  #   code_name: "noble"
-  #   edition: enterprise
-  #   bucket: repo.mongodb.com
-  #   component: multiverse
-  #   architectures:
-  #     - amd64
-  #     - ppc64el
-  #     - s390x
-  #     - arm64
-  #   repos:
-  #     - apt/ubuntu/dists/noble/mongodb-enterprise
+
+  - name: ubuntu2404
+    type: deb
+    code_name: "noble"
+    edition: enterprise
+    bucket: repo.mongodb.com
+    component: multiverse
+    architectures:
+      - amd64
+      - ppc64el
+      - s390x
+      - arm64
+    repos:
+      - apt/ubuntu/dists/noble/mongodb-enterprise
diff --git a/tools/genevergreen/generate/generate.go b/tools/genevergreen/generate/generate.go
@@ -35,38 +35,36 @@ var (
 
 	unsupportedOsByVersion = map[string][]string{
 		"8.0": {"debian11"},
+		"7.0": {"ubuntu2404"},
+		"6.0": {"ubuntu2404"},
+		"5.0": {"ubuntu2404"},
 	}
 
 	oses = []string{
-		"amazonlinux2",
 		"centos8",
 		"rhel9",
 		"debian11",
 		"debian12",
 		"ubuntu20.04",
 		"ubuntu22.04",
-		// TODO: CLOUDP-246693: Add Ubuntu 24.04
-		// "ubuntu24.04",
+		"ubuntu24.04",
 	}
 	repos      = []string{"org", "enterprise"}
 	postPkgImg = map[string]string{
-		"centos8":      "centos8-rpm",
-		"rhel9":        "rhel9-rpm",
-		"amazonlinux2": "amazonlinux2-rpm",
-		"ubuntu20.04":  "ubuntu20.04-deb",
-		"ubuntu22.04":  "ubuntu22.04-deb",
-		// TODO: CLOUDP-246693: Add Ubuntu 24.04
-		// "ubuntu24.04":  "ubuntu24.04-deb",
-		"debian11": "debian11-deb",
-		"debian12": "debian12-deb",
+		"centos8":     "centos8-rpm",
+		"rhel9":       "rhel9-rpm",
+		"ubuntu20.04": "ubuntu20.04-deb",
+		"ubuntu22.04": "ubuntu22.04-deb",
+		"ubuntu24.04": "ubuntu24.04-deb",
+		"debian11":    "debian11-deb",
+		"debian12":    "debian12-deb",
 	}
 	newOs = map[string]string{
-		"centos8":     "rhel80",
-		"rhel9":       "rhel90",
-		"ubuntu20.04": "ubuntu2004",
-		"ubuntu22.04": "ubuntu2204",
-		// TODO: CLOUDP-246693: Add Ubuntu 24.04
-		// "ubuntu24.04":     "ubuntu2404",
+		"centos8":         "rhel80",
+		"rhel9":           "rhel90",
+		"ubuntu20.04":     "ubuntu2004",
+		"ubuntu22.04":     "ubuntu2204",
+		"ubuntu24.04":     "ubuntu2404",
 		"debian11":        "debian11",
 		"debian12":        "debian12",
 		"amazonlinux2023": "amazon2023",
@@ -217,7 +215,7 @@ func PublishSnapshotTasks(c *shrub.Configuration) {
 	publishVariant(
 		c,
 		v,
-		"5.0",
+		"8.0",
 		"",
 		dependency,
 		false,

diff --git a/tools/genevergreen/generate/generate_test.go b/tools/genevergreen/generate/generate_test.go
@@ -34,5 +34,5 @@ func TestPublishStableTasks(t *testing.T) {
 	c := &shrub.Configuration{}
 	PublishStableTasks(c)
 	assert.Len(t, c.Variants, 4)
-	assert.Len(t, c.Tasks, 108)
+	assert.Len(t, c.Tasks, 112)
 }
diff --git a/tools/genevergreen/generate/publish.go b/tools/genevergreen/generate/publish.go
@@ -65,11 +65,10 @@ var distros = map[string]Platform{
 		extension:     deb,
 		architectures: []string{x86_64, arm64},
 	},
-	// TODO: CLOUDP-246693: Add Ubuntu 24.04
-	// "ubuntu2404": {
-	// 	extension:     deb,
-	// 	architectures: []string{x86_64, arm64},
-	// },
+	"ubuntu2404": {
+		extension:     deb,
+		architectures: []string{x86_64, arm64},
+	},
 }
 
 func newPublishTask(taskName, extension, edition, distro, taskServerVersion, notaryKey, arch string, stable bool, dependency []shrub.TaskDependency) *shrub.Task {