Skip to content

Commit

Permalink
SERVER-77231 Platform Support: Add support for Debian 12
Browse files Browse the repository at this point in the history
  • Loading branch information
briananthonymccarthy authored and Evergreen Agent committed Oct 3, 2023
1 parent 9a8dc92 commit 6cba851
Show file tree
Hide file tree
Showing 8 changed files with 159 additions and 1 deletion.
5 changes: 5 additions & 0 deletions buildscripts/package_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@
"python3", "python-is-python3", "wget", "pkg-config", "systemd", "procps",
"file"
]), "python3"),
'debian12': ('debian:12-slim', "apt",
frozenset([
"python3", "python-is-python3", "wget", "pkg-config", "systemd", "procps",
"file"
]), "python3"),
'debian71': ('debian:7-slim', "apt",
frozenset(["python", "python3", "wget", "pkg-config", "systemd", "procps",
"file"]), "python3"),
Expand Down
4 changes: 3 additions & 1 deletion buildscripts/packager.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ def repo_os_version(self, build_os):
return 'buster'
elif build_os == 'debian11':
return 'bullseye'
elif build_os == 'debian12':
return 'bookworm'
else:
raise Exception("unsupported build_os: %s" % build_os)
else:
Expand Down Expand Up @@ -366,7 +368,7 @@ def build_os(self, arch):
"ubuntu2204",
]
elif self.dname == 'debian':
return ["debian81", "debian92", "debian10", "debian11"]
return ["debian81", "debian92", "debian10", "debian11", "debian12"]
else:
raise Exception("BUG: unsupported platform?")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,21 @@ evergreen_buildvariants:
platform: debian11
architecture: x86_64

- name: debian12
edition: targeted
platform: debian12
architecture: x86_64

- name: enterprise-debian11-64
edition: enterprise
platform: debian11
architecture: x86_64

- name: enterprise-debian12-64
edition: enterprise
platform: debian12
architecture: x86_64

- name: windows
edition: base
platform: windows
Expand Down
1 change: 1 addition & 0 deletions buildscripts/toolchains.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class ToolchainDistroName(Tuple[str, ...], enum.Enum):
DEBIAN9 = ('debian92', )
DEBIAN10 = ('debian10', )
DEBIAN11 = ('debian11', )
DEBIAN12 = ('debian12', )
MACOS1012 = ('macos-1012', )
MACOS1014 = ('macos-1014', )
MACOS1100 = ('macos-1100', )
Expand Down
3 changes: 3 additions & 0 deletions etc/evergreen_yml_components/definitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ variables:
- enterprise-amazon2023-arm64
- enterprise-amazon2023-arm64-lto
- enterprise-debian11-64
- enterprise-debian12-64
- enterprise-linux-64-amazon-ami
- enterprise-macos
- enterprise-macos-arm64
Expand Down Expand Up @@ -380,7 +381,9 @@ variables:
- enterprise-amazon2023
- enterprise-amazon2023-arm64
- debian11
- debian12
- enterprise-debian11-64
- enterprise-debian12-64
- rhel70
- rhel76_compile_rhel70
- enterprise-rhel-70-64-bit
Expand Down
113 changes: 113 additions & 0 deletions etc/evergreen_yml_components/variants/misc_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,119 @@ buildvariants:
- name: .publish
- name: generate_buildid_to_debug_symbols_mapping

- name: debian12
display_name: Debian 12
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
run_on:
- debian12-small
expansions:
push_path: linux
push_bucket: downloads.mongodb.org
push_name: linux
push_arch: x86_64-debian12
compile_flags: >-
--ssl
MONGO_DISTMOD=debian12
-j$(grep -c ^processor /proc/cpuinfo)
--variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
--use-diagnostic-latches=off
test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer
multiversion_platform: debian12
multiversion_edition: targeted
has_packages: true
packager_script: packager.py
packager_arch: x86_64
packager_distro: debian12
repo_edition: org
scons_cache_scope: shared
large_distro_name: debian12-large
compile_variant: debian12
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
- debian12-large
- name: .aggfuzzer .common !.feature_flag_guarded !.multiversion
- name: aggregation !.feature_flag_guarded
- name: aggregation_auth
- name: .auth !.audit !.multiversion
- name: sharding_auth_gen
- name: causally_consistent_jscore_txns_passthrough
- name: .misc_js
- name: .concurrency .common
- name: concurrency_replication_causal_consistency_gen
- name: disk_wiredtiger
- name: .jscore .common !.decimal !.feature_flag_guarded
- name: .jstestfuzz .common
- name: replica_sets_gen
- name: .replica_sets .common
- name: .sharding .jscore !.wo_snapshot !.multi_stmt
- name: .sharding .common !.csrs !.encrypt !.multiversion
- name: sharding_max_mirroring_opportunistic_secondary_targeting_gen
- name: .ssl
- name: .stitch
- name: test_packages
distros:
- ubuntu2204-large
- name: .publish
- name: generate_buildid_to_debug_symbols_mapping

- name: enterprise-debian12-64
display_name: Enterprise Debian 12
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
modules:
- enterprise
run_on:
- debian12-small
expansions:
additional_package_targets: >-
archive-mongocryptd
archive-mongocryptd-debug
push_path: linux
push_bucket: downloads.10gen.com
push_name: linux
push_arch: x86_64-enterprise-debian12
compile_flags: >-
--ssl MONGO_DISTMOD=debian12
-j$(grep -c ^processor /proc/cpuinfo)
--variables-files=etc/scons/mongodbtoolchain_stable_gcc.vars
--use-diagnostic-latches=off
test_flags: --excludeWithAnyTags=requires_external_data_source,requires_latch_analyzer
crypt_task_compile_flags: >-
SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique"
CCFLAGS="-fno-gnu-unique"
multiversion_platform: debian12
multiversion_edition: enterprise
has_packages: true
packager_script: packager_enterprise.py
packager_arch: x86_64
packager_distro: debian12
repo_edition: enterprise
scons_cache_scope: shared
large_distro_name: debian12-large
compile_variant: enterprise-debian12-64
tasks:
- name: compile_test_and_package_serial_no_unittests_TG
distros:
- debian12-large
- name: .aggfuzzer .common !.feature_flag_guarded !.multiversion
- name: audit
- name: causally_consistent_jscore_txns_passthrough
- name: .encrypt !.replica_sets !.aggregation !.sharding !.jscore
- name: .jscore .common !.decimal !.sharding !.feature_flag_guarded
- name: .jstestfuzz .common
- name: replica_sets_auth_gen
- name: replica_sets_jscore_passthrough
- name: sasl
- name: sharding_auth_audit_gen
- name: .stitch
- name: .crypt
- name: .publish_crypt
- name: test_packages
distros:
- ubuntu2204-large
- name: .publish
- name: generate_buildid_to_debug_symbols_mapping

- name: rhel70
display_name: RHEL 7.0
cron: "0 4 * * *" # From the ${project_nightly_cron} parameter.
Expand Down
2 changes: 2 additions & 0 deletions etc/generate_subtasks_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ build_variant_large_distro_exceptions:
- amazon2023
- amazon2023-arm64
- debian11
- debian12
- enterprise-amazon2
- enterprise-amazon2-arm64
- enterprise-amazon2023
- enterprise-amazon2023-lto
- enterprise-amazon2023-arm64
- enterprise-amazon2023-arm64-lto
- enterprise-debian11-64
- enterprise-debian12-64
- enterprise-linux-64-amazon-ami
- enterprise-macos
- enterprise-macos-arm64
Expand Down
22 changes: 22 additions & 0 deletions etc/repo_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,17 @@ repos:
repos:
- apt/debian/dists/bullseye/mongodb-org

- name: debian12
type: deb
code_name: "bookworm"
bucket: repo.mongodb.org
edition: org
component: main
architectures:
- amd64
repos:
- apt/debian/dists/bookworm/mongodb-org

- name: debian71
type: deb
code_name: "wheezy"
Expand Down Expand Up @@ -426,6 +437,17 @@ repos:
repos:
- apt/debian/dists/bullseye/mongodb-enterprise

- name: debian12
type: deb
edition: enterprise
code_name: "bookworm"
bucket: repo.mongodb.com
component: main
architectures:
- amd64
repos:
- apt/debian/dists/bookworm/mongodb-enterprise

- name: debian92
type: deb
edition: enterprise
Expand Down

0 comments on commit 6cba851

Please sign in to comment.