(DOCSP-24110) Adds RHEL 9/Ubuntu Jammy support, updates yum/apt to 6.0 (#761)

sarahsimpers · web-flow · commit 6906833b7510 · 2022-08-17T15:01:20.000-04:00
* (DOCSP-24110) Adds RHEL 9/Ubuntu Jammy support, updates yum/apt to 6.0 * Reorganizes tabs
diff --git a/snooty.toml b/snooty.toml
@@ -179,7 +179,7 @@ mcli = "MongoDB CLI"
 mcli-long = "MongoDB Command Line Interface (``mongocli``)"
 mcli-version = "1.25.0"
 mdbagent = "MongoDB Agent"
-mdbVersion = "5.0"
+mdbVersion = "6.0"
 mongosh = ":binary:`~bin.mongosh`"
 
 [substitutions]
diff --git a/source/includes/steps-install-mcli-apt.yaml b/source/includes/steps-install-mcli-apt.yaml
@@ -28,33 +28,50 @@ content: |
 
         .. tabs::
 
-           .. tab:: Ubuntu 20.04 (Focal)
-              :tabid: comm-focal
+           .. tab:: Ubuntu
+              :tabid: ubuntu
 
-              .. code-block:: sh
+              .. tabs::
 
-                 echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
+                 .. tab:: Ubuntu 22.04 (Jammy)
+                    :tabid: comm-jammy
 
-           .. tab:: Ubuntu 18.04 (Bionic)
-              :tabid: comm-bionic
+                    .. code-block:: sh
 
-              .. code-block:: sh
+                       echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
 
-                 echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
+                 .. tab:: Ubuntu 20.04 (Focal)
+                    :tabid: comm-focal
 
-           .. tab:: Debian 10 (Buster)
-              :tabid: comm-deb-10
+                    .. code-block:: sh
 
-              .. code-block:: sh
+                       echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
 
-                 echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
+                 .. tab:: Ubuntu 18.04 (Bionic)
+                    :tabid: comm-bionic
 
-           .. tab:: Debian 9 (Stretch)
-              :tabid: comm-deb-9
+                    .. code-block:: sh
 
-              .. code-block:: sh
+                       echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
 
-                 echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
+           .. tab:: Debian
+              :tabid: debian
+
+              .. tabs::            
+
+                 .. tab:: Debian 10 (Buster)
+                    :tabid: comm-deb-10
+
+                    .. code-block:: sh
+
+                       echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
+
+                 .. tab:: Debian 9 (Stretch)
+                    :tabid: comm-deb-9
+
+                    .. code-block:: sh
+
+                       echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-org-{+mdbVersion+}.list
 
      .. tab:: MongoDB Enterprise Edition
         :tabid: mdb-comm
@@ -64,33 +81,50 @@ content: |
         
         .. tabs::
 
-           .. tab:: Ubuntu 20.04 (Focal)
-              :tabid: ent-focal
+           .. tab:: Ubuntu
+              :tabid: ubuntu
+
+              .. tabs::
+
+                 .. tab:: Ubuntu 22.04 (Jammy)
+                    :tabid: ent-jammy
+
+                    .. code-block:: sh
+
+                       echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.com/apt/ubuntu jammy/mongodb-enterprise/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
+
+                 .. tab:: Ubuntu 20.04 (Focal)
+                    :tabid: ent-focal
+
+                    .. code-block:: sh
+
+                       echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.com/apt/ubuntu focal/mongodb-enterprise/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
 
-              .. code-block:: sh
+                 .. tab:: Ubuntu 18.04 (Bionic)
+                    :tabid: ent-bionic
 
-                 echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.com/apt/ubuntu focal/mongodb-enterprise/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
+                    .. code-block:: sh
 
-           .. tab:: Ubuntu 18.04 (Bionic)
-              :tabid: ent-bionic
+                       echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.com/apt/ubuntu bionic/mongodb-enterprise/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
 
-              .. code-block:: sh
+           .. tab:: Debian
+              :tabid: debian
 
-                 echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.com/apt/ubuntu bionic/mongodb-enterprise/{+mdbVersion+} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
+              .. tabs::
 
-           .. tab:: Debian 10 (Buster)
-              :tabid: ent-deb-10
+                 .. tab:: Debian 10 (Buster)
+                    :tabid: ent-deb-10
 
-              .. code-block:: sh
+                    .. code-block:: sh
 
-                 echo "deb http://repo.mongodb.com/apt/debian buster/mongodb-enterprise/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
+                       echo "deb http://repo.mongodb.com/apt/debian buster/mongodb-enterprise/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
 
-           .. tab:: Debian 9 (Stretch)
-              :tabid: ent-deb-9
+                 .. tab:: Debian 9 (Stretch)
+                    :tabid: ent-deb-9
 
-              .. code-block:: sh
+                    .. code-block:: sh
 
-                 echo "deb http://repo.mongodb.com/apt/debian stretch/mongodb-enterprise/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
+                       echo "deb http://repo.mongodb.com/apt/debian stretch/mongodb-enterprise/{+mdbVersion+} main" | sudo tee /etc/apt/sources.list.d/mongodb-enterprise.list
               
 ---
 stepnum: 3
diff --git a/source/install/compatibility.txt b/source/install/compatibility.txt
@@ -40,13 +40,13 @@ systems:
      - 2012, 2012R2, 2016, 2019
      - ``x86-64``
    * - Red Hat Enterprise Linux / CentOS
-     - 7, 8
+     - 7, 8, 9
      - ``x86-64``, ``ARM``
    * - SUSE Linux Enterprise Server
      - 12, 15
      - ``x86-64``, ``ARM``
    * - Ubuntu
-     - 18.04, 20.04
+     - 18.04, 20.04, 22.04
      - ``x86-64``, ``ARM``
 
 Atlas, Cloud Manager, and Ops Manager Versions
