TOOLS-3604 Update platforms to rhel8.8 (x86_64 and arm64) and rhel9.3 (x86_64 and arm64)

common.yml

@@ -2078,10 +2078,10 @@ buildvariants:
       - name: "push"
         run_on: rhel80-small
 
-  - name: rhel80
-    display_name: "# RHEL 8.0"
+  - name: rhel88
+    display_name: "# RHEL 8.8"
     run_on:
-      - rhel80-test
+      - rhel8.8-large
     expansions:
       <<:
         [
@@ -2116,10 +2116,10 @@ buildvariants:
       - name: "push"
         run_on: rhel80-small
 
-  - name: rhel90
-    display_name: RHEL 9.0
+  - name: rhel93
+    display_name: RHEL 9.3
     run_on:
-      - rhel90-small
+      - rhel93-small
     tasks:
       - name: "dist"
       - name: "sign"
@@ -2359,10 +2359,10 @@ buildvariants:
       - name: "push"
         run_on: rhel80-small
 
-  - name: rhel82-aarch64
-    display_name: RHEL 8.2 ARM
+  - name: rhel88-aarch64
+    display_name: RHEL 8.8 ARM
     run_on:
-      - rhel82-arm64
+      - rhel8.8-arm64-small
     stepback: false
     tasks:
       - name: "dist"
@@ -2371,10 +2371,10 @@ buildvariants:
       - name: "push"
         run_on: rhel80-small
 
-  - name: rhel90-aarch64
-    display_name: RHEL 9.0 ARM
+  - name: rhel93-aarch64
+    display_name: RHEL 9.3 ARM
     run_on:
-      - rhel90-arm64-small
+      - rhel93-arm64-small
     stepback: false
     tasks:
       - name: "dist"
@@ -2456,13 +2456,13 @@ github_pr_aliases:
     task: "^.*$"
   # Run all integration tests on one variant. We pick RHEL 8.0 because it's
   # a relatively recent platform that supports a wide range of servers.
-  - variant: "rhel80"
+  - variant: "rhel88"
     task: "^(aws-auth|integration|legacy|native-cert-ssl|qa-dump-restore|qa-tests)-.*"
   # Run a subset of integration tests against the 3.6 version of MongoDB
   # Server on all variants where that is the most recent supported version.
   - variant: "^rhel62-no-kerberos$"
     task: "integration-3.6"
   # Run a subset of integration tests against the latest version of MongoDB
   # Server on all variants where that is the most recent supported version.
-  - variant: "^(rhel80|windows)$"
+  - variant: "^(rhel88|windows)$"
     task: "integration-latest"

etc/repo-config.yml

@@ -128,6 +128,14 @@ repos:
       - yum/redhat/8/mongodb-org
       - yum/redhat/8Server/mongodb-org
 
+  - name: rhel88
+    type: rpm
+    edition: org
+    bucket: repo.mongodb.org
+    repos:
+      - yum/redhat/8/mongodb-org
+      - yum/redhat/8Server/mongodb-org
+
   - name: rhel90
     type: rpm
     edition: org
@@ -136,6 +144,14 @@ repos:
       - yum/redhat/9/mongodb-org
       - yum/redhat/9Server/mongodb-org
 
+  - name: rhel93
+    type: rpm
+    edition: org
+    bucket: repo.mongodb.org
+    repos:
+      - yum/redhat/9/mongodb-org
+      - yum/redhat/9Server/mongodb-org
+
   - name: amazon
     type: rpm
     edition: org

release/evergreen/evergreen.go

@@ -118,7 +118,10 @@ func GetPackageTaskForVersion(variant, version string) (string, error) {
 
 	buildID := ""
 
-	fmt.Printf("all builds: %s\n", evgVersion.BuildVariantStatus)
+	fmt.Printf("looking for variant %s within builds:\n", variant)
+	for _, buildDetail := range evgVersion.BuildVariantStatus {
+		fmt.Println(buildDetail)
+	}
 
 	for _, buildDetail := range evgVersion.BuildVariantStatus {
 		if buildDetail.BuildVariant == variant {

release/platform/platform.go

@@ -63,6 +63,7 @@ type Platform struct {
 	BinaryExt         string
 	SkipForJSONFeed   bool
 	ServerVariantName string
+	ServerPlatform    string
 }
 
 func (p Platform) Variant() string {
@@ -465,15 +466,6 @@ var platforms = []Platform{
 		Repos:     []Repo{RepoEnterprise},
 		BuildTags: defaultBuildTags,
 	},
-	{
-		Name:              "rhel80",
-		Arch:              ArchX86_64,
-		OS:                OSLinux,
-		Pkg:               PkgRPM,
-		Repos:             []Repo{RepoEnterprise, RepoOrg},
-		BuildTags:         defaultBuildTags,
-		ServerVariantName: "enterprise-rhel-80-64-bit",
-	},
 	{
 		Name:      "rhel81",
 		Arch:      ArchPpc64le,
@@ -483,31 +475,42 @@ var platforms = []Platform{
 		BuildTags: defaultBuildTags,
 	},
 	{
-		Name:      "rhel82",
+		Name:      "rhel83",
+		Arch:      ArchS390x,
+		OS:        OSLinux,
+		Pkg:       PkgRPM,
+		Repos:     []Repo{RepoEnterprise},
+		BuildTags: defaultBuildTags,
+	},
+	{
+		Name:      "rhel88",
 		Arch:      ArchAarch64,
 		OS:        OSLinux,
 		Pkg:       PkgRPM,
-		Repos:     []Repo{RepoEnterprise, RepoOrg},
+		Repos:     []Repo{RepoOrg, RepoEnterprise},
 		BuildTags: defaultBuildTags,
 	},
 	{
-		Name:      "rhel83",
-		Arch:      ArchS390x,
+		Name:      "rhel88",
+		Arch:      ArchX86_64,
 		OS:        OSLinux,
 		Pkg:       PkgRPM,
-		Repos:     []Repo{RepoEnterprise},
+		Repos:     []Repo{RepoOrg, RepoEnterprise},
 		BuildTags: defaultBuildTags,
+		// Using server rhel 80 builds because "enterprise-rhel-80-64-bit" is not available for all server versions.
+		ServerVariantName: "enterprise-rhel-80-64-bit",
+		ServerPlatform:    "rhel80",
 	},
 	{
-		Name:      "rhel90",
+		Name:      "rhel93",
 		Arch:      ArchAarch64,
 		OS:        OSLinux,
 		Pkg:       PkgRPM,
 		Repos:     []Repo{RepoOrg, RepoEnterprise},
 		BuildTags: defaultBuildTags,
 	},
 	{
-		Name:      "rhel90",
+		Name:      "rhel93",
 		Arch:      ArchX86_64,
 		OS:        OSLinux,
 		Pkg:       PkgRPM,

release/release.go

@@ -1357,7 +1357,12 @@ func downloadMongodAndShell(v string) {
 	err = json.NewDecoder(res.Body).Decode(&feed)
 	check(err, "decode JSON feed")
 
-	url, githash, serverVersion, err := feed.FindURLHashAndVersion(v, pf.Name, string(pf.Arch), "enterprise")
+	target := pf.Name
+	if pf.ServerPlatform != "" {
+		target = pf.ServerPlatform
+	}
+
+	url, githash, serverVersion, err := feed.FindURLHashAndVersion(v, target, string(pf.Arch), "enterprise")
 	if err == download.ServerURLMissingError {
 		// If a server version is not found from JSON feed, handle this by downloading the artifacts from evergreen.
 		fmt.Printf("warning: download a version not found in JSON feed\n")