From 1e53b330b267907102736d5107768b77eccb8ee8 Mon Sep 17 00:00:00 2001
From: Filipe Menezes <filipe.menezes@mongodb.com>
Date: Thu, 18 Aug 2022 15:08:57 +0100
Subject: [PATCH 1/2] CLOUDP-133279: Fix repo configuration for Ubuntu 22 &
 RHEL 9 and also fix for 6.0 repo

---
 build/ci/release.yml      |  1 +
 build/ci/repo_config.yaml | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/build/ci/release.yml b/build/ci/release.yml
index 45053f9538..f61d13a2bf 100644
--- a/build/ci/release.yml
+++ b/build/ci/release.yml
@@ -197,6 +197,7 @@ functions:
           - signing_auth_token_44
           - signing_auth_token_46
           - signing_auth_token_50
+          - signing_auth_token_60
           - tool_name
         env:
           <<: *go_env
diff --git a/build/ci/repo_config.yaml b/build/ci/repo_config.yaml
index 6db02cd9fc..6721adb54f 100644
--- a/build/ci/repo_config.yaml
+++ b/build/ci/repo_config.yaml
@@ -106,6 +106,14 @@ repos:
       - yum/redhat/8/mongodb-org
       - yum/redhat/8Server/mongodb-org
 
+  - name: rhel90
+    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
@@ -252,6 +260,20 @@ repos:
     repos:
       - apt/ubuntu/dists/focal/mongodb-org
 
+  - name: ubuntu2204
+    type: deb
+    code_name: "jammy"
+    edition: org
+    bucket: repo.mongodb.org
+    component: multiverse
+    architectures:
+      - amd64
+      - i386
+      - s390x
+      - arm64
+    repos:
+      - apt/ubuntu/dists/jammy/mongodb-org
+
   ####################
   #
   # Enterprise Repos:
@@ -306,6 +328,14 @@ repos:
       - yum/redhat/8/mongodb-enterprise
       - yum/redhat/8Server/mongodb-enterprise
 
+  - name: rhel90
+    type: rpm
+    edition: enterprise
+    bucket: repo.mongodb.com
+    repos:
+      - yum/redhat/9/mongodb-enterprise
+      - yum/redhat/9Server/mongodb-enterprise
+
   - name: amazon
     type: rpm
     edition: enterprise
@@ -462,3 +492,17 @@ repos:
       - arm64
     repos:
       - apt/ubuntu/dists/focal/mongodb-enterprise
+  - name: ubuntu2204
+    type: deb
+    code_name: "jammy"
+    edition: enterprise
+    bucket: repo.mongodb.com
+    component: multiverse
+    architectures:
+      - amd64
+      - ppc64el
+      - i386
+      - s390x
+      - arm64
+    repos:
+      - apt/ubuntu/dists/jammy/mongodb-enterprise

From d8ecc93fd336a50bb3bf9778ae3b12c64f8eb4f2 Mon Sep 17 00:00:00 2001
From: Filipe Menezes <filipe.menezes@mongodb.com>
Date: Thu, 18 Aug 2022 15:14:11 +0100
Subject: [PATCH 2/2] Add 6.0 for tests

---
 tools/genevergreen/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/genevergreen/main.go b/tools/genevergreen/main.go
index 0318fb02e5..d4f062129a 100644
--- a/tools/genevergreen/main.go
+++ b/tools/genevergreen/main.go
@@ -32,7 +32,7 @@ const (
 )
 
 var (
-	serverVersions = []string{"4.2", "4.4", "5.0"}
+	serverVersions = []string{"4.2", "4.4", "5.0", "6.0"}
 	oses           = []string{"amazonlinux2", "centos7", "centos8", "rhel9", "debian9", "debian10", "ubuntu18.04", "ubuntu20.04", "ubuntu22.04"}
 	repos          = []string{"org", "enterprise"}
 	postPkgImg     = map[string]string{