CLOUDP-257881: Remove RHEL 7.x and Amazon 2 (#3061)

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

Hide file tree

Showing 10 changed files with 10 additions and 153 deletions.
diff --git a/build/ci/repo_config.yaml b/build/ci/repo_config.yaml
@@ -66,22 +66,6 @@ repos:
   #
   ####################
 
-  - name: rhel70
-    type: rpm
-    edition: org
-    bucket: repo.mongodb.org
-    repos:
-      - yum/redhat/7/mongodb-org
-      - yum/redhat/7Server/mongodb-org
-
-  - name: rhel72
-    type: rpm
-    edition: org
-    bucket: repo.mongodb.org
-    repos:
-      - yum/redhat/7/mongodb-org
-      - yum/redhat/7Server/mongodb-org
-
   - name: rhel80
     type: rpm
     edition: org
@@ -98,13 +82,6 @@ repos:
       - yum/redhat/9/mongodb-org
       - yum/redhat/9Server/mongodb-org
 
-  - name: amazon2
-    type: rpm
-    edition: org
-    bucket: repo.mongodb.org
-    repos:
-      - yum/amazon/2/mongodb-org
-
   - name: amazon2023
     type: rpm
     edition: org
@@ -204,30 +181,6 @@ repos:
   #
   ####################
 
-  - name: rhel70
-    type: rpm
-    edition: enterprise
-    bucket: repo.mongodb.com
-    repos:
-      - yum/redhat/7/mongodb-enterprise
-      - yum/redhat/7Server/mongodb-enterprise
-
-  - name: rhel71
-    type: rpm
-    edition: enterprise
-    bucket: repo.mongodb.com
-    repos:
-      - yum/redhat/7/mongodb-enterprise
-      - yum/redhat/7Server/mongodb-enterprise
-
-  - name: rhel72
-    type: rpm
-    edition: enterprise
-    bucket: repo.mongodb.com
-    repos:
-      - yum/redhat/7/mongodb-enterprise
-      - yum/redhat/7Server/mongodb-enterprise
-
   - name: rhel80
     type: rpm
     edition: enterprise
@@ -244,13 +197,6 @@ repos:
       - yum/redhat/9/mongodb-enterprise
       - yum/redhat/9Server/mongodb-enterprise
 
-  - name: amazon2
-    type: rpm
-    edition: enterprise
-    bucket: repo.mongodb.com
-    repos:
-      - yum/amazon/2/mongodb-enterprise
-
   - name: amazon2023
     type: rpm
     edition: enterprise

diff --git a/...ackage/docker/amazonlinux2-rpm.Dockerfile → ...age/docker/amazonlinux2023-rpm.Dockerfile b/...ackage/docker/amazonlinux2-rpm.Dockerfile → ...age/docker/amazonlinux2023-rpm.Dockerfile
@@ -1,4 +1,4 @@
-FROM amazonlinux:2
+FROM amazonlinux:2023
 
 
 ARG url

diff --git a/build/package/docker/centos7-rpm.Dockerfile b/build/package/docker/centos7-rpm.Dockerfile
diff --git a/...e/docker/meta/amazonlinux2-rpm.Dockerfile → ...ocker/meta/amazonlinux2023-rpm.Dockerfile b/...e/docker/meta/amazonlinux2-rpm.Dockerfile → ...ocker/meta/amazonlinux2023-rpm.Dockerfile
@@ -1,10 +1,10 @@
-FROM amazonlinux:2
+FROM amazonlinux:2023
 
 ARG url
 ARG entrypoint
 ARG server_version
 
-RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/amazon/2/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
+RUN printf "[mongodb-org-${server_version}]\nname=MongoDB Repository\nbaseurl=https://repo.mongodb.org/yum/amazon/2023/mongodb-org/${server_version}/x86_64/\ngpgcheck=1\nenabled=1\ngpgkey=https://pgp.mongodb.com/server-${server_version}.asc\n" > /etc/yum.repos.d/mongodb-org-${server_version}.repo
 
 RUN set -eux; \
     curl --silent --show-error --fail --location --retry 3 \

diff --git a/build/package/docker/meta/centos7-rpm.Dockerfile b/build/package/docker/meta/centos7-rpm.Dockerfile
diff --git a/build/package/docker/repo/amazonlinux2.Dockerfile b/build/package/docker/repo/amazonlinux2.Dockerfile
diff --git a/build/package/docker/repo/centos7.Dockerfile b/build/package/docker/repo/centos7.Dockerfile
diff --git a/tools/genevergreen/generate/generate.go b/tools/genevergreen/generate/generate.go
@@ -34,12 +34,11 @@ var (
 	}
 
 	unsupportedOsByVersion = map[string][]string{
-		"8.0": {"debian11", "rhel70", "amazon2"},
+		"8.0": {"debian11"},
 	}
 
 	oses = []string{
 		"amazonlinux2",
-		"centos7",
 		"centos8",
 		"rhel9",
 		"debian11",
@@ -51,7 +50,6 @@ var (
 	}
 	repos      = []string{"org", "enterprise"}
 	postPkgImg = map[string]string{
-		"centos7":      "centos7-rpm",
 		"centos8":      "centos8-rpm",
 		"rhel9":        "rhel9-rpm",
 		"amazonlinux2": "amazonlinux2-rpm",
@@ -63,12 +61,10 @@ var (
 		"debian12": "debian12-deb",
 	}
 	newOs = map[string]string{
-		"centos7":      "rhel70",
-		"centos8":      "rhel80",
-		"rhel9":        "rhel90",
-		"amazonlinux2": "amazon2",
-		"ubuntu20.04":  "ubuntu2004",
-		"ubuntu22.04":  "ubuntu2204",
+		"centos8":     "rhel80",
+		"rhel9":       "rhel90",
+		"ubuntu20.04": "ubuntu2004",
+		"ubuntu22.04": "ubuntu2204",
 		// TODO: CLOUDP-246693: Add Ubuntu 24.04
 		// "ubuntu24.04":     "ubuntu2404",
 		"debian11":        "debian11",

diff --git a/tools/genevergreen/generate/generate_test.go b/tools/genevergreen/generate/generate_test.go
@@ -26,13 +26,13 @@ import (
 func TestPublishSnapshotTasks(t *testing.T) {
 	c := &shrub.Configuration{}
 	PublishSnapshotTasks(c)
-	assert.Len(t, c.Tasks, 34)
+	assert.Len(t, c.Tasks, 28)
 	assert.Len(t, c.Variants, 2)
 }
 
 func TestPublishStableTasks(t *testing.T) {
 	c := &shrub.Configuration{}
 	PublishStableTasks(c)
 	assert.Len(t, c.Variants, 4)
-	assert.Len(t, c.Tasks, 126)
+	assert.Len(t, c.Tasks, 108)
 }
diff --git a/tools/genevergreen/generate/publish.go b/tools/genevergreen/generate/publish.go
@@ -37,18 +37,10 @@ const (
 
 // distros - if updating this list verify build/ci/repo_config.yaml matches.
 var distros = map[string]Platform{
-	"amazon2": {
-		extension:     rpm,
-		architectures: []string{x86_64, aarch64},
-	},
 	"amazon2023": {
 		extension:     rpm,
 		architectures: []string{x86_64, aarch64},
 	},
-	"rhel70": {
-		extension:     rpm,
-		architectures: []string{x86_64},
-	},
 	"rhel80": {
 		extension:     rpm,
 		architectures: []string{x86_64, aarch64},