SERVER-62299 Add support for Debian 11

6 files changed, 134 insertions, 2 deletions

diff --git a/buildscripts/package_test/kitchen.yml b/buildscripts/package_test/kitchen.yml
index 93778f0e620..78f46351663 100644
--- a/buildscripts/package_test/kitchen.yml
+++ b/buildscripts/package_test/kitchen.yml
@@ -63,6 +63,11 @@ platforms:
       image_id: ami-0dedf6a6502877301
     transport:
       username: admin
+  - name: debian11-x86-64
+    driver:
+      image_id: ami-06a80441f25333895
+    transport:
+      username: admin
   - name: rhel70-x86-64
     driver:
       image_id: ami-2051294a
diff --git a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
index 3c00af4c60b..2bbc118f29a 100644
--- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
+++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb
@@ -168,7 +168,7 @@ if deb
     # All versions of Debian 10 will use /usr/sbin/nologin for service
     # account shells
     its('shell') {
-      if ((os[:name] == 'debian' and os[:release].split('.')[0] == '10') or
+      if ((os[:name] == 'debian' and os[:release].split('.')[0] >= '10') or
           (os[:name] == 'ubuntu' and os[:release] == '18.04') or
           (os[:name] == 'ubuntu' and os[:release] == '20.04'))
         should eq '/usr/sbin/nologin'
diff --git a/buildscripts/packager.py b/buildscripts/packager.py
index acaec1cc75d..5b4b2dfdb8a 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -311,6 +311,8 @@ class Distro(object):
                 return 'stretch'
             elif build_os == 'debian10':
                 return 'buster'
+            elif build_os == 'debian11':
+                return 'bullseye'
             else:
                 raise Exception("unsupported build_os: %s" % build_os)
         else:
@@ -351,7 +353,7 @@ class Distro(object):
                 "ubuntu2004",
             ]
         elif self.dname == 'debian':
-            return ["debian81", "debian92", "debian10"]
+            return ["debian81", "debian92", "debian10", "debian11"]
         else:
             raise Exception("BUG: unsupported platform?")
 
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index e6419d1d981..46dc7ac7b54 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -326,6 +326,7 @@ variables:
   - enterprise-amazon2-arm64
   - enterprise-debian92-64
   - enterprise-debian10-64
+  - enterprise-debian11-64
   - enterprise-linux-64-amazon-ami
   - enterprise-macos
   - enterprise-rhel-70-64-bit
@@ -382,7 +383,9 @@ variables:
   - enterprise-amazon2
   - enterprise-amazon2-arm64
   - debian10
+  - debian11
   - enterprise-debian10-64
+  - enterprise-debian11-64
   - debian92
   - enterprise-debian92-64
   - rhel70
@@ -10355,6 +10358,104 @@ buildvariants:
     - debian10-small
   - name: generate_buildid_to_debug_symbols_mapping
 
+- name: enterprise-debian11-64
+  display_name: Enterprise Debian 11
+  modules:
+  - enterprise
+  run_on:
+  - debian11-small
+  expansions:
+    additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug
+    push_path: linux
+    push_bucket: downloads.10gen.com
+    push_name: linux
+    push_arch: x86_64-enterprise-debian11
+    compile_flags: --ssl MONGO_DISTMOD=debian11 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+    multiversion_platform: debian11
+    multiversion_edition: enterprise
+    has_packages: true
+    packager_script: packager_enterprise.py
+    packager_arch: x86_64
+    packager_distro: debian11
+    repo_edition: enterprise
+    scons_cache_scope: shared
+    large_distro_name: debian11-large
+  tasks:
+  - name: compile_test_and_package_serial_TG
+    distros:
+    - debian11-large
+  - name: build_variant_gen
+  - name: .aggfuzzer .common !.multiversion
+  - name: audit
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
+  - name: .jscore .common !.decimal !.compat !.sharding
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: replica_sets_auth_gen
+  - name: replica_sets_jscore_passthrough
+  - name: sasl
+  - name: sharding_auth_gen
+  - name: snmp
+  - name: .stitch
+  - name: test_packages
+    distros:
+    - ubuntu2004-package
+  - name: .publish
+    distros:
+    - debian11-small
+  - name: generate_buildid_to_debug_symbols_mapping
+
+- name: debian11
+  display_name: Debian 11
+  run_on:
+  - debian11-small
+  expansions:
+    push_path: linux
+    push_bucket: downloads.mongodb.org
+    push_name: linux
+    push_arch: x86_64-debian11
+    compile_flags: --ssl MONGO_DISTMOD=debian11 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
+    multiversion_platform: debian11
+    multiversion_edition: targeted
+    has_packages: true
+    packager_script: packager.py
+    packager_arch: x86_64
+    packager_distro: debian11
+    repo_edition: org
+    scons_cache_scope: shared
+    large_distro_name: debian11-large
+  tasks:
+  - name: compile_test_and_package_serial_TG
+    distros:
+    - debian11-large
+  - name: build_variant_gen
+  - name: .aggfuzzer .common !.multiversion
+  - name: aggregation
+  - name: aggregation_auth
+  - name: .auth !.audit !.multiversion
+  - name: causally_consistent_jscore_txns_passthrough
+  - name: .misc_js
+  - name: .concurrency .common
+  - name: concurrency_replication_causal_consistency_gen
+  - name: disk_wiredtiger
+  - name: free_monitoring
+  - name: .jscore .common !.decimal
+  - name: .jstestfuzz .common
+  - name: .logical_session_cache .one_sec
+  - name: replica_sets_gen
+  - name: .replica_sets .common
+  - name: .sharding .jscore !.wo_snapshot !.multi_stmt
+  - name: .sharding .common !.op_query !.csrs
+  - name: .ssl
+  - name: .stitch
+  - name: test_packages
+    distros:
+    - ubuntu2004-package
+  - name: .publish
+    distros:
+    - debian11-small
+  - name: generate_buildid_to_debug_symbols_mapping
 ################################
 # storage engine buildvariants #
 ################################
diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml
index 6311ae48167..ebdc924ad58 100644
--- a/etc/generate_subtasks_config.yml
+++ b/etc/generate_subtasks_config.yml
@@ -2,10 +2,12 @@ build_variant_large_distro_exceptions:
   - amazon
   - amazon2
   - debian10
+  - debian11
   - debian92
   - enterprise-amazon2
   - enterprise-amazon2-arm64
   - enterprise-debian10-64
+  - enterprise-debian11-64
   - enterprise-debian92-64
   - enterprise-linux-64-amazon-ami
   - enterprise-macos
diff --git a/etc/repo_config.yaml b/etc/repo_config.yaml
index 6eb5833c52d..c026cb7290a 100644
--- a/etc/repo_config.yaml
+++ b/etc/repo_config.yaml
@@ -167,6 +167,17 @@ repos:
     repos:
       - apt/debian/dists/buster/mongodb-org
 
+  - name: debian11
+    type: deb
+    code_name: "bullseye"
+    bucket: repo.mongodb.org
+    edition: org
+    component: main
+    architectures:
+      - amd64
+    repos:
+      - apt/debian/dists/bullseye/mongodb-org
+
   - name: debian71
     type: deb
     code_name: "wheezy"
@@ -346,6 +357,17 @@ repos:
     repos:
       - apt/debian/dists/buster/mongodb-enterprise
 
+  - name: debian11
+    type: deb
+    edition: enterprise
+    code_name: "bullseye"
+    bucket: repo.mongodb.com
+    component: main
+    architectures:
+      - amd64
+    repos:
+      - apt/debian/dists/bullseye/mongodb-enterprise
+
   - name: debian92
     type: deb
     edition: enterprise