diff --git a/.gitmodules b/.gitmodules index 7d99999ee9a..f8f59a31d9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,8 @@ url = https://github.com/sonic-net/sonic-linux-kernel [submodule "sonic-sairedis"] path = src/sonic-sairedis - url = https://github.com/sonic-net/sonic-sairedis + url = https://github.com/yue-fred-gao/sonic-sairedis + branch = arp_passthrough [submodule "sonic-swss"] path = src/sonic-swss url = https://github.com/sonic-net/sonic-swss @@ -129,7 +130,8 @@ url = https://github.com/Marvell-switching/sonic-platform-marvell.git [submodule "platform/vpp"] path = platform/vpp - url = https://github.com/sonic-net/sonic-platform-vpp.git + url = https://github.com/yue-fred-gao/sonic-platform-vpp.git + branch = relocate_vpp_mk [submodule "platform/marvell-prestera/mrvl-prestera"] path = platform/marvell-prestera/mrvl-prestera url = https://github.com/Marvell-switching/mrvl-prestera.git diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dd0edd96d22..39ec459f289 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,8 +27,8 @@ resources: repositories: - repository: sonic-mgmt type: github - name: sonic-net/sonic-mgmt - ref: master + name: yue-fred-gao/sonic-mgmt + ref: enable_vpp_pr_checker endpoint: sonic-net - repository: buildimage type: github diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile index 66f88f894c3..b318477871f 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-32x100G-t1.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile index 692f79decc1..a783acd52ee 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+48x50G.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile index 08abf119894..84794af8a2a 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+24x40G.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile index f9a1e2bdc4d..68a6fac961e 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-T96C8/sai.profile @@ -1,2 +1,5 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th-a7060-cx32s-8x100G+96x25G.config.bcm SAI_NUM_ECMP_MEMBERS=64 +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile index 28ab4255723..60ce19f0168 100644 --- a/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile +++ b/device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S/sai.profile @@ -1 +1,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/th-a7060-cx32s-flex-all.config.bcm +# BROADCOM_LEGACY_SAI_COMPAT: TH1 (BCM56960) has no streaming telemetry platform driver; +# sai_query_stats_st_capability crashes in brcm_sai_st_pd_ctr_cap_list_get. +SAI_STATS_ST_CAPABILITY_SUPPORTED=0 diff --git a/dockers/docker-lldp/lldpd.conf.j2 b/dockers/docker-lldp/lldpd.conf.j2 index 59d20f47756..63937e3f2fe 100644 --- a/dockers/docker-lldp/lldpd.conf.j2 +++ b/dockers/docker-lldp/lldpd.conf.j2 @@ -5,6 +5,10 @@ {% if mgmt_if.update({'port_name' : mgmt_name}) %} {% endif %} {% if mgmt_if.update({'ipv4' : mgmt_prefix|ip}) %} {% endif %} {% endif %} +{% if mgmt_prefix|ipv6 and (mgmt_if.ipv4 is not defined) %} +{% if mgmt_if.update({'port_name' : mgmt_name}) %} {% endif %} +{% if mgmt_if.update({'ipv6' : mgmt_prefix|ip}) %} {% endif %} +{% endif %} {% endfor %} {% endif %} {% if mgmt_if %} @@ -16,7 +20,11 @@ configure ports eth0 lldp portidsubtype local {{ MGMT_PORT[mgmt_if.port_name].al configure ports eth0 lldp portidsubtype local {{ mgmt_if.port_name }} {% endif %} {% endif %} +{% if mgmt_if.ipv4 %} configure system ip management pattern {{ mgmt_if.ipv4 }} +{% elif mgmt_if.ipv6 %} +configure system ip management pattern {{ mgmt_if.ipv6 }} +{% endif %} {% endif %} configure system hostname {{ DEVICE_METADATA['localhost']['hostname'] }} {# pause lldpd operations until all interfaces are well configured, resume command will run in lldpmgrd #} diff --git a/dockers/docker-telemetry-sidecar/cli-plugin-tests/test_systemd_stub.py b/dockers/docker-telemetry-sidecar/cli-plugin-tests/test_systemd_stub.py index 6962282ae60..fc9ad1ba71e 100644 --- a/dockers/docker-telemetry-sidecar/cli-plugin-tests/test_systemd_stub.py +++ b/dockers/docker-telemetry-sidecar/cli-plugin-tests/test_systemd_stub.py @@ -342,31 +342,143 @@ def test_reconcile_enables_user_auth_and_cname(ss): ss, container_fs, host_fs, commands, config_db = ss # Set module-level flags directly (they're read inside reconcile) ss.GNMI_VERIFY_ENABLED = True - ss.GNMI_CLIENT_CNAME = "AME Infra CA o6" + ss.GNMI_CLIENT_CERTS = [{"cname": "fake-infra-ca.test.example.com", "role": "gnmi_show_readonly"}] # Precondition: empty DB assert config_db == {} ss.reconcile_config_db_once() - # user_auth must be set to 'cert' - assert config_db.get("GNMI|gnmi", {}).get("user_auth") == "cert" - # CNAME hash must exist with role=gnmi_show_readonly (default GNMI_CLIENT_ROLE) - cname_key = f"GNMI_CLIENT_CERT|{ss.GNMI_CLIENT_CNAME}" - assert config_db.get(cname_key, {}).get("role") == "gnmi_show_readonly" + assert config_db.get("TELEMETRY|gnmi", {}).get("user_auth") == "cert" + # CNAME hash must exist with role=gnmi_show_readonly + assert config_db.get("GNMI_CLIENT_CERT|fake-infra-ca.test.example.com", {}).get("role") == "gnmi_show_readonly" def test_reconcile_disabled_removes_cname(ss): ss, container_fs, host_fs, commands, config_db = ss ss.GNMI_VERIFY_ENABLED = False - ss.GNMI_CLIENT_CNAME = "AME Infra CA o6" + ss.GNMI_CLIENT_CERTS = [{"cname": "fake-infra-ca.test.example.com", "role": "gnmi_show_readonly"}] # Seed an existing entry to be removed - config_db[f"GNMI_CLIENT_CERT|{ss.GNMI_CLIENT_CNAME}"] = {"role": "gnmi_show_readonly"} + config_db["GNMI_CLIENT_CERT|fake-infra-ca.test.example.com"] = {"role": "gnmi_show_readonly"} ss.reconcile_config_db_once() - assert f"GNMI_CLIENT_CERT|{ss.GNMI_CLIENT_CNAME}" not in config_db + assert "GNMI_CLIENT_CERT|fake-infra-ca.test.example.com" not in config_db + +def test_reconcile_multiple_cnames(ss): + ss, container_fs, host_fs, commands, config_db = ss + ss.GNMI_VERIFY_ENABLED = True + ss.GNMI_CLIENT_CERTS = [ + {"cname": "fake-client.test.example.com", "role": "admin"}, + {"cname": "fake-server.test.example.com", "role": '["gnmi_show_readonly","admin"]'}, + ] + assert config_db == {} + ss.reconcile_config_db_once() + + assert config_db.get("TELEMETRY|gnmi", {}).get("user_auth") == "cert" + assert config_db.get("GNMI_CLIENT_CERT|fake-client.test.example.com", {}).get("role") == "admin" + assert config_db.get("GNMI_CLIENT_CERT|fake-server.test.example.com", {}).get("role") == '["gnmi_show_readonly","admin"]' + +# ─────────────────────────── Tests for _parse_client_certs ─────────────────────────── + +class TestParseClientCerts: + """Tests for _parse_client_certs() env-var parsing.""" + + @pytest.fixture(autouse=True) + def _fresh_module(self, monkeypatch): + if "systemd_stub" in sys.modules: + del sys.modules["systemd_stub"] + self.monkeypatch = monkeypatch + + def _import_with_env(self, env_vars): + """Set env vars, re-import systemd_stub, and return the parsed GNMI_CLIENT_CERTS.""" + for k, v in env_vars.items(): + if v is None: + self.monkeypatch.delenv(k, raising=False) + else: + self.monkeypatch.setenv(k, v) + # Clear stale env vars not in the dict + for k in ("GNMI_CLIENT_CERTS", "TELEMETRY_CLIENT_CNAME", "GNMI_CLIENT_ROLE"): + if k not in env_vars: + self.monkeypatch.delenv(k, raising=False) + if "systemd_stub" in sys.modules: + del sys.modules["systemd_stub"] + ss = importlib.import_module("systemd_stub") + return ss.GNMI_CLIENT_CERTS + + def test_valid_json_array(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '[{"cname": "client.gbl", "role": "admin"}]' + }) + assert certs == [{"cname": "client.gbl", "role": "admin"}] + + def test_valid_json_multiple_entries(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '[{"cname": "a.gbl", "role": "admin"}, {"cname": "b.gbl", "role": "readonly"}]' + }) + assert len(certs) == 2 + assert certs[0] == {"cname": "a.gbl", "role": "admin"} + assert certs[1] == {"cname": "b.gbl", "role": "readonly"} + + def test_non_array_json_falls_back_to_legacy(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '{"cname": "c.gbl", "role": "admin"}', + "TELEMETRY_CLIENT_CNAME": "legacy.gbl", + "GNMI_CLIENT_ROLE": "readonly", + }) + assert certs == [{"cname": "legacy.gbl", "role": "readonly"}] + + def test_invalid_json_falls_back_to_legacy(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": "not-json!", + "TELEMETRY_CLIENT_CNAME": "fallback.gbl", + }) + assert certs == [{"cname": "fallback.gbl", "role": "gnmi_show_readonly"}] + + def test_entry_not_dict_falls_back(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '["not-a-dict"]', + "TELEMETRY_CLIENT_CNAME": "fb.gbl", + }) + assert certs == [{"cname": "fb.gbl", "role": "gnmi_show_readonly"}] + + def test_entry_missing_role_falls_back(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '[{"cname": "x.gbl"}]', + "TELEMETRY_CLIENT_CNAME": "fb.gbl", + }) + assert certs == [{"cname": "fb.gbl", "role": "gnmi_show_readonly"}] + + def test_entry_empty_cname_falls_back(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '[{"cname": " ", "role": "admin"}]', + "TELEMETRY_CLIENT_CNAME": "fb.gbl", + }) + assert certs == [{"cname": "fb.gbl", "role": "gnmi_show_readonly"}] + + def test_legacy_single_entry(self): + certs = self._import_with_env({ + "TELEMETRY_CLIENT_CNAME": "legacy.gbl", + "GNMI_CLIENT_ROLE": "admin", + }) + assert certs == [{"cname": "legacy.gbl", "role": "admin"}] + + def test_legacy_default_role(self): + certs = self._import_with_env({ + "TELEMETRY_CLIENT_CNAME": "legacy.gbl", + }) + assert certs == [{"cname": "legacy.gbl", "role": "gnmi_show_readonly"}] + + def test_no_env_returns_empty(self): + certs = self._import_with_env({}) + assert certs == [] + + def test_whitespace_stripped(self): + certs = self._import_with_env({ + "GNMI_CLIENT_CERTS": '[{"cname": " client.gbl ", "role": " admin "}]' + }) + assert certs == [{"cname": "client.gbl", "role": "admin"}] # ─────────────────────────── Tests for _get_branch_name ─────────────────────────── diff --git a/dockers/docker-telemetry-sidecar/systemd_stub.py b/dockers/docker-telemetry-sidecar/systemd_stub.py index 05126cff6bc..198ea67f6d9 100644 --- a/dockers/docker-telemetry-sidecar/systemd_stub.py +++ b/dockers/docker-telemetry-sidecar/systemd_stub.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 from __future__ import annotations +import json import os import re import subprocess import time import argparse -from typing import List +from typing import Dict, List from sonic_py_common.sidecar_common import ( get_bool_env_var, logger, SyncItem, @@ -21,11 +22,46 @@ # CONFIG_DB reconcile env GNMI_VERIFY_ENABLED = get_bool_env_var("TELEMETRY_CLIENT_CERT_VERIFY_ENABLED", default=False) -GNMI_CLIENT_CNAME = os.getenv("TELEMETRY_CLIENT_CNAME", "") -GNMI_CLIENT_ROLE = os.getenv("GNMI_CLIENT_ROLE", "gnmi_show_readonly") +def _parse_client_certs() -> List[Dict[str, str]]: + """ + Build the list of GNMI client cert entries from env vars. + + Preferred: GNMI_CLIENT_CERTS (JSON array of {"cname": ..., "role": ...}) + Fallback: TELEMETRY_CLIENT_CNAME / GNMI_CLIENT_ROLE (single entry, backward-compat) + """ + raw = os.getenv("GNMI_CLIENT_CERTS", "").strip() + if raw: + try: + entries = json.loads(raw) + if not isinstance(entries, list): + raise ValueError("GNMI_CLIENT_CERTS must be a JSON array") + normalized: List[Dict[str, str]] = [] + for e in entries: + if not isinstance(e, dict): + raise ValueError(f"Each entry must be an object: {e!r}") + if "cname" not in e or "role" not in e: + raise ValueError(f"Each entry needs 'cname' and 'role': {e}") + cname = str(e.get("cname", "")).strip() + role = str(e.get("role", "")).strip() + if not cname or not role: + raise ValueError(f"'cname' and 'role' must be non-empty strings: {e}") + normalized.append({"cname": cname, "role": role}) + return normalized + except (json.JSONDecodeError, ValueError) as exc: + logger.log_error(f"Bad GNMI_CLIENT_CERTS env var: {exc}; falling back to legacy") + + # Legacy single-entry env vars + cname = os.getenv("TELEMETRY_CLIENT_CNAME", "").strip() + role = os.getenv("GNMI_CLIENT_ROLE", "gnmi_show_readonly").strip() + if cname: + return [{"cname": cname, "role": role}] + return [] + + +GNMI_CLIENT_CERTS: List[Dict[str, str]] = _parse_client_certs() logger.log_notice(f"IS_V1_ENABLED={IS_V1_ENABLED}") -logger.log_notice(f"GNMI_CLIENT_ROLE={GNMI_CLIENT_ROLE}") +logger.log_notice(f"GNMI_CLIENT_CERTS={GNMI_CLIENT_CERTS}") _TELEMETRY_SRC = ( "/usr/share/sonic/systemd_scripts/telemetry_v1.sh" @@ -134,31 +170,25 @@ def _get_branch_name() -> str: def _ensure_user_auth_cert() -> None: - cur = db_hget("GNMI|gnmi", "user_auth") + cur = db_hget("TELEMETRY|gnmi", "user_auth") if cur != "cert": - if db_hset("GNMI|gnmi", "user_auth", "cert"): - logger.log_notice(f"Set GNMI|gnmi.user_auth=cert (was: {cur or ''})") + if db_hset("TELEMETRY|gnmi", "user_auth", "cert"): + logger.log_notice(f"Set TELEMETRY|gnmi.user_auth=cert (was: {cur or ''})") else: - logger.log_error("Failed to set GNMI|gnmi.user_auth=cert") + logger.log_error("Failed to set TELEMETRY|gnmi.user_auth=cert") -def _ensure_cname_present(cname: str) -> None: - if not cname: - logger.log_warning("TELEMETRY_CLIENT_CNAME not set; skip CNAME creation") - return - +def _ensure_cname_present(cname: str, role: str) -> None: key = f"GNMI_CLIENT_CERT|{cname}" entry = db_hgetall(key) if not entry: - if db_hset(key, "role", GNMI_CLIENT_ROLE): - logger.log_notice(f"Created {key} with role={GNMI_CLIENT_ROLE}") + if db_hset(key, "role", role): + logger.log_notice(f"Created {key} with role={role}") else: logger.log_error(f"Failed to create {key}") def _ensure_cname_absent(cname: str) -> None: - if not cname: - return key = f"GNMI_CLIENT_CERT|{cname}" if db_hgetall(key): if db_del(key): @@ -166,20 +196,21 @@ def _ensure_cname_absent(cname: str) -> None: else: logger.log_error(f"Failed to remove {key}") - def reconcile_config_db_once() -> None: """ Idempotent drift-correction for CONFIG_DB: - When TELEMETRY_CLIENT_CERT_VERIFY_ENABLED=true: - * Ensure GNMI|gnmi.user_auth=cert - * Ensure GNMI_CLIENT_CERT| exists with role= - - When false: ensure the CNAME row is absent + * Ensure TELEMETRY|gnmi.user_auth=cert + * Ensure every GNMI_CLIENT_CERT| entry exists with its role + - When false: ensure all CNAME rows are absent """ if GNMI_VERIFY_ENABLED: _ensure_user_auth_cert() - _ensure_cname_present(GNMI_CLIENT_CNAME) + for entry in GNMI_CLIENT_CERTS: + _ensure_cname_present(entry["cname"], entry["role"]) else: - _ensure_cname_absent(GNMI_CLIENT_CNAME) + for entry in GNMI_CLIENT_CERTS: + _ensure_cname_absent(entry["cname"]) # Host destination for service_checker.py HOST_SERVICE_CHECKER = "/usr/local/lib/python3.11/dist-packages/health_checker/service_checker.py" diff --git a/dockers/docker-telemetry-watchdog/watchdog/src/main.rs b/dockers/docker-telemetry-watchdog/watchdog/src/main.rs index bb2f11f622b..c736e17d279 100644 --- a/dockers/docker-telemetry-watchdog/watchdog/src/main.rs +++ b/dockers/docker-telemetry-watchdog/watchdog/src/main.rs @@ -36,14 +36,40 @@ const GNMI_BASE_CMD: &str = "gnmi_get"; // assumed in PATH const SHOW_API_PROBE_ENV_VAR: &str = "TELEMETRY_WATCHDOG_SHOW_API_PROBE_ENABLED"; // optional: set to "true" to enable serial number probing const SERIALNUMBER_PROBE_ENV_VAR: &str = "TELEMETRY_WATCHDOG_SERIALNUMBER_PROBE_ENABLED"; -const TARGET_NAME_ENV_VAR: &str = "TELEMETRY_WATCHDOG_TARGET_NAME"; // optional override for target_name -const DEFAULT_TARGET_NAME: &str = "server.ndastreaming.ap.gbl"; -const DEFAULT_CA_CRT: &str = "/etc/sonic/telemetry/dsmsroot.cer"; -const DEFAULT_SERVER_CRT: &str = "/etc/sonic/telemetry/streamingtelemetryserver.cer"; -const DEFAULT_SERVER_KEY: &str = "/etc/sonic/telemetry/streamingtelemetryserver.key"; +const TARGET_NAME_ENV_VAR: &str = "TELEMETRY_WATCHDOG_TARGET_NAME"; +const CA_CRT_ENV_VAR: &str = "TELEMETRY_WATCHDOG_CA_CRT"; +const SERVER_CRT_ENV_VAR: &str = "TELEMETRY_WATCHDOG_SERVER_CRT"; +const SERVER_KEY_ENV_VAR: &str = "TELEMETRY_WATCHDOG_SERVER_KEY"; +const BAD_CA_ENV_VAR: &str = "TELEMETRY_WATCHDOG_BAD_CA"; +const BAD_CERT_ENV_VAR: &str = "TELEMETRY_WATCHDOG_BAD_CERT"; +const BAD_KEY_ENV_VAR: &str = "TELEMETRY_WATCHDOG_BAD_KEY"; +const BAD_CNAME_ENV_VAR: &str = "TELEMETRY_WATCHDOG_BAD_CNAME"; +const GOOD_CA_ENV_VAR: &str = "TELEMETRY_WATCHDOG_GOOD_CA"; +const GOOD_CERT_ENV_VAR: &str = "TELEMETRY_WATCHDOG_GOOD_CERT"; +const GOOD_KEY_ENV_VAR: &str = "TELEMETRY_WATCHDOG_GOOD_KEY"; +const GOOD_CNAME_ENV_VAR: &str = "TELEMETRY_WATCHDOG_GOOD_CNAME"; + +const DEFAULT_TARGET_NAME: &str = "default-target-name"; +const DEFAULT_CA_CRT: &str = "/path/to/ca.crt"; +const DEFAULT_SERVER_CRT: &str = "/path/to/server.crt"; +const DEFAULT_SERVER_KEY: &str = "/path/to/server.key"; // Max stderr we keep per gnmi_get (bytes) before truncation. const STDERR_TRUNCATE_LIMIT: usize = 16 * 1024; // 16KB +const CERT_PROBE_ENV_VAR: &str = "TELEMETRY_WATCHDOG_CERT_PROBE_ENABLED"; + +// BAD (expected fail) probe +const DEFAULT_BAD_CA: &str = "/path/to/bad-ca.crt"; +const DEFAULT_BAD_CERT: &str = "/path/to/bad-cert.crt"; +const DEFAULT_BAD_KEY: &str = "/path/to/bad-cert.key"; +const DEFAULT_BAD_CNAME: &str = "bad-cname.example.com"; + +// GOOD (expected success) probe +const DEFAULT_GOOD_CA: &str = "/path/to/good-ca.crt"; +const DEFAULT_GOOD_CERT: &str = "/path/to/good-cert.crt"; +const DEFAULT_GOOD_KEY: &str = "/path/to/good-cert.key"; +const DEFAULT_GOOD_CNAME: &str = "good-cname.example.com"; + // Configuration: // 1. JSON file (/cmd_list.json) optional. Format: // { @@ -61,6 +87,13 @@ const STDERR_TRUNCATE_LIMIT: usize = 16 * 1024; // 16KB // Any failure (spawn error / non-zero exit) sets HTTP 500; body lists per-xpath results. // SHOW probe control: env TELEMETRY_WATCHDOG_SHOW_API_PROBE="disable" skips gnmi_get xpaths (default enabled). +fn env_or_default(env_var: &str, default: &str) -> String { + match env::var(env_var) { + Ok(v) if !v.trim().is_empty() => v.trim().to_string(), + _ => default.to_string(), + } +} + fn load_xpath_list() -> (Vec, Vec) { let mut set: HashSet = HashSet::new(); let mut errors: Vec = Vec::new(); @@ -259,13 +292,13 @@ fn get_security_config() -> TelemetrySecurityConfig { // TELEMETRY|gnmi: client_auth let ca_crt = redis_hget("TELEMETRY|certs", "ca_crt") .filter(|v| !v.trim().is_empty()) - .unwrap_or_else(|| DEFAULT_CA_CRT.to_string()); + .unwrap_or_else(|| env_or_default(CA_CRT_ENV_VAR, DEFAULT_CA_CRT)); let server_crt = redis_hget("TELEMETRY|certs", "server_crt") .filter(|v| !v.trim().is_empty()) - .unwrap_or_else(|| DEFAULT_SERVER_CRT.to_string()); + .unwrap_or_else(|| env_or_default(SERVER_CRT_ENV_VAR, DEFAULT_SERVER_CRT)); let server_key = redis_hget("TELEMETRY|certs", "server_key") .filter(|v| !v.trim().is_empty()) - .unwrap_or_else(|| DEFAULT_SERVER_KEY.to_string()); + .unwrap_or_else(|| env_or_default(SERVER_KEY_ENV_VAR, DEFAULT_SERVER_KEY)); let client_auth_opt = redis_hget("TELEMETRY|gnmi", "client_auth"); let use_client_auth = matches!(client_auth_opt.as_ref(), Some(v) if v.eq_ignore_ascii_case("true")); TelemetrySecurityConfig { use_client_auth, ca_crt, server_crt, server_key } @@ -303,6 +336,13 @@ fn is_serialnumber_probe_enabled() -> bool { } } +fn is_cert_probe_enabled() -> bool { + match env::var(CERT_PROBE_ENV_VAR) { + Ok(v) if v.eq_ignore_ascii_case("true") => true, + _ => false, // default disabled + } +} + fn get_gnmi_port() -> u16 { match redis_hget("TELEMETRY|gnmi", "port") { Some(p) => p.parse::().unwrap_or_else(|_| { @@ -382,6 +422,45 @@ fn main() { let timeout = read_timeout(); let target_name = get_target_name(); + // Certificate probes on reboot-cause/history API + // 1) BAD cert: expect failure + // 2) GOOD cert: expect success + // Only run cert probes when client_auth is actually enabled; + // otherwise the probes would always fail against an insecure server. + if is_cert_probe_enabled() && sec_cfg.use_client_auth { + let xpath_rc = "reboot-cause/history"; + + let bad_sec = TelemetrySecurityConfig { + use_client_auth: true, + ca_crt: env_or_default(BAD_CA_ENV_VAR, DEFAULT_BAD_CA), + server_crt: env_or_default(BAD_CERT_ENV_VAR, DEFAULT_BAD_CERT), + server_key: env_or_default(BAD_KEY_ENV_VAR, DEFAULT_BAD_KEY), + }; + let bad_cname = env_or_default(BAD_CNAME_ENV_VAR, DEFAULT_BAD_CNAME); + let mut res_bad = run_gnmi_for_xpath(&xpath_rc, port, &bad_sec, &bad_cname, timeout, "SHOW"); + if res_bad.success { + res_bad.success = false; + let msg = "Expected FAILURE with BAD cert but command SUCCEEDED".to_string(); + res_bad.error = Some(match res_bad.error.take() { + Some(existing) => format!("{existing}; {msg}"), + None => msg, + }); + http_status = "HTTP/1.1 500 Internal Server Error"; + } + cmd_results.push(res_bad); + + let good_sec = TelemetrySecurityConfig { + use_client_auth: true, + ca_crt: env_or_default(GOOD_CA_ENV_VAR, DEFAULT_GOOD_CA), + server_crt: env_or_default(GOOD_CERT_ENV_VAR, DEFAULT_GOOD_CERT), + server_key: env_or_default(GOOD_KEY_ENV_VAR, DEFAULT_GOOD_KEY), + }; + let good_cname = env_or_default(GOOD_CNAME_ENV_VAR, DEFAULT_GOOD_CNAME); + let res_good = run_gnmi_for_xpath(&xpath_rc, port, &good_sec, &good_cname, timeout, "SHOW"); + if !res_good.success { http_status = "HTTP/1.1 500 Internal Server Error"; } + cmd_results.push(res_good); + } + // Check Serial Number if is_serialnumber_probe_enabled() { let xpath_sn = "DEVICE_METADATA/localhost/chassis_serial_number"; diff --git a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm index 39fa50ee009..42716d2f463 100644 --- a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm +++ b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm @@ -10,7 +10,7 @@ libdoca-sdk-dpdk-bridge-dev==3.3.0055-1 libdoca-sdk-flow-dev==3.3.0055-1 libgrpc-dev==1.39.0-1 libibverbs-dev==2601.0.1-1 -libnl-3-200==3.7.0-0.2+b1sonic1 +libnetsnmptrapd40==5.9.3+dfsg-2+deb12u1 libnl-3-dev==3.7.0-0.2+b1sonic1 libnl-cli-3-200==3.7.0-0.2+b1sonic1 libnl-cli-3-dev==3.7.0-0.2+b1sonic1 @@ -18,7 +18,6 @@ libnl-genl-3-200==3.7.0-0.2+b1sonic1 libnl-genl-3-dev==3.7.0-0.2+b1sonic1 libnl-nf-3-200==3.7.0-0.2+b1sonic1 libnl-nf-3-dev==3.7.0-0.2+b1sonic1 -libnl-route-3-200==3.7.0-0.2+b1sonic1 libnl-route-3-dev==3.7.0-0.2+b1sonic1 libnvhws-dev==26.01.3-1 libnvhws1==26.01.3-1 @@ -31,6 +30,9 @@ libsairedis-dev==1.0.0 libsaithrift-dev==0.9.4 libsaivs==1.0.0 libsaivs-dev==1.0.0 +libsnmp-base==5.9.3+dfsg-2+deb12u1 +libsnmp-dev==5.9.3+dfsg-2+deb12u1 +libsnmp40==5.9.3+dfsg-2+deb12u1 libswsscommon==1.0.0 libswsscommon-dev==1.0.0 libteam-dev==1.31-1 @@ -39,7 +41,7 @@ libteam5==1.31-1 libteamdctl0==1.31-1 libyang==1.0.73 libyang-cpp==1.0.73 -libyang-dev==3.12.2-1 +libyang-dev==1.0.73 libyang3==3.12.2-1 mlnx-dpdk==22.11.0-2510.2.1 mlnx-dpdk-dev==22.11.0-2510.2.1 @@ -58,5 +60,5 @@ sonic-bmp==0.1 sonic-mgmt-common==1.0.0 sonic-mgmt-common-codegen==1.0.0 stp==1.0.0 -sys-sdk-dev==1.mlnx.4.8.3404 -sys-sdk-main==1.mlnx.4.8.3404 +sys-sdk-dev==1.mlnx.4.8.3412 +sys-sdk-main==1.mlnx.4.8.3412 diff --git a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-arm64 b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-arm64 index 84e045e8dc2..5a72f480300 100644 --- a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-arm64 +++ b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-arm64 @@ -1 +1,2 @@ -libyang-dev==1.0.73 +libnl-3-200==3.7.0-0.2+b1sonic1 +libnl-route-3-200==3.7.0-0.2+b1sonic1 diff --git a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-armhf b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-armhf index 84e045e8dc2..5a72f480300 100644 --- a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-armhf +++ b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-deb-bookworm-armhf @@ -1 +1,2 @@ -libyang-dev==1.0.73 +libnl-3-200==3.7.0-0.2+b1sonic1 +libnl-route-3-200==3.7.0-0.2+b1sonic1 diff --git a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3 b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3 index 91aa14e1ccd..26ecd14065c 100644 --- a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3 +++ b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3 @@ -1,4 +1,4 @@ -blessed==1.30.0 +blessed==1.33.0 click-log==0.4.0 colorful==0.5.8 deepdiff==8.6.1 @@ -6,7 +6,7 @@ docker==7.1.0 docker-image-py==0.1.13 enlighten==1.14.1 enum34==1.1.10 -filelock==3.24.3 +filelock==3.25.2 freezegun==1.5.5 ijson==3.2.3 inotify==0.2.12 diff --git a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-arm64 b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-arm64 index 5d807806795..a7f89ad8b79 100644 --- a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-arm64 +++ b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-arm64 @@ -3,4 +3,3 @@ cffi==2.0.0 pyyaml==6.0.1 requests==2.32.5 urllib3==2.6.3 -zipp==1.2.0 diff --git a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-armhf b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-armhf index 5d807806795..a7f89ad8b79 100644 --- a/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-armhf +++ b/files/build/versions-public/build/build-sonic-slave-bookworm/versions-py3-all-armhf @@ -3,4 +3,3 @@ cffi==2.0.0 pyyaml==6.0.1 requests==2.32.5 urllib3==2.6.3 -zipp==1.2.0 diff --git a/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie b/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie index 3ac0a4426de..9cb637356fd 100644 --- a/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie +++ b/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie @@ -3,28 +3,32 @@ gpio-mlxbf3-dkms==1.0-0 kernel-mft-dkms==4.34.0-145 kernel-mft-dkms-modules-6.12.41+deb13-sonic-arm64==4.34.0 libdashapi==1.0.0 -libnl-3-200==3.7.0-0.2+b1sonic1 -libnl-3-dev==3.7.0-0.2+b1sonic1 libnl-cli-3-200==3.7.0-0.2+b1sonic1 libnl-cli-3-dev==3.7.0-0.2+b1sonic1 -libnl-genl-3-200==3.7.0-0.2+b1sonic1 -libnl-genl-3-dev==3.7.0-0.2+b1sonic1 libnl-nf-3-200==3.7.0-0.2+b1sonic1 libnl-nf-3-dev==3.7.0-0.2+b1sonic1 -libnl-route-3-200==3.7.0-0.2+b1sonic1 libnl-route-3-dev==3.7.0-0.2+b1sonic1 libpcre16-3==2:8.39-15 libpcre3==2:8.39-15 libpcre3-dev==2:8.39-15 libpcre32-3==2:8.39-15 libpcrecpp0v5==2:8.39-15 +libsaimetadata==1.0.0 +libsaimetadata-dev==1.0.0 +libsairedis==1.0.0 +libsairedis-dev==1.0.0 +libsaivs==1.0.0 libswsscommon==1.0.0 libswsscommon-dev==1.0.0 libtac-dev==1.4.1-1 libtac2==1.4.1-1 +libteam-dev==1.31-1 +libteam-utils==1.31-1 +libteam5==1.31-1 +libteamdctl0==1.31-1 libyang==1.0.73 libyang-cpp==1.0.73 -libyang-dev==3.12.2-1 +libyang-dev==1.0.73 libyang3==3.12.2-1 linux-headers-6.12.41+deb13-common-sonic==6.12.41-1 linux-headers-6.12.41+deb13-sonic-amd64==6.12.41-1 @@ -53,3 +57,4 @@ python3-yang==1.0.73 sdhci-of-dwcmshc-dkms==1.0-0 sonic-platform-pddf==1.1 sonic-platform-pddf-sym==1.1 +stp==1.0.0 diff --git a/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-arm64 b/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-arm64 deleted file mode 100644 index 84e045e8dc2..00000000000 --- a/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-arm64 +++ /dev/null @@ -1 +0,0 @@ -libyang-dev==1.0.73 diff --git a/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-armhf b/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-armhf index 047cd0a5540..923125dbb6e 100644 --- a/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-armhf +++ b/files/build/versions-public/build/build-sonic-slave-trixie/versions-deb-trixie-armhf @@ -1,3 +1,3 @@ -libyang-dev==1.0.73 +libnl-route-3-200==3.7.0-0.2+b1sonic1 linux-headers-6.12.41+deb13-sonic-armmp==6.12.41-1 linux-image-6.12.41+deb13-sonic-armmp==6.12.41-1 diff --git a/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3 b/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3 index 70105b9bfe9..c3b3091fc9b 100644 --- a/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3 +++ b/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3 @@ -1,8 +1,9 @@ +bitarray==2.8.1 click-log==0.4.0 colorful==0.5.8 docker==7.1.0 docker-image-py==0.1.13 -filelock==3.24.3 +filelock==3.25.2 ijson==3.2.3 inotify==0.2.12 ipaddress==1.0.23 @@ -22,6 +23,7 @@ pyroute2==0.9.5 pytest-mock==3.15.1 responses==0.26.0 semantic-version==2.10.0 +supervisor==4.3.0 tabulate==0.9.0 toposort==1.6 www-authenticate==0.9.2 diff --git a/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-arm64 b/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-arm64 index 700c39d6392..e864ddd5c80 100644 --- a/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-arm64 +++ b/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-arm64 @@ -1,2 +1 @@ -bitarray==2.8.1 scp==0.14.5 diff --git a/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-armhf b/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-armhf index 700c39d6392..e864ddd5c80 100644 --- a/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-armhf +++ b/files/build/versions-public/build/build-sonic-slave-trixie/versions-py3-all-armhf @@ -1,2 +1 @@ -bitarray==2.8.1 scp==0.14.5 diff --git a/files/build/versions-public/default/versions-docker b/files/build/versions-public/default/versions-docker index 9226ff21061..65d5fb8c440 100644 --- a/files/build/versions-public/default/versions-docker +++ b/files/build/versions-public/default/versions-docker @@ -1,10 +1,10 @@ -amd64:amd64/debian:bookworm==sha256:9cd199264f968a0ec04bac1255b6ab64d68544de638378f33e8ab2ea748d9c71 -amd64:debian:bookworm==sha256:34e7f0ae7c10a61bfbef6e1b2ed205d9b47bb12e90c50696f729a5c7a01cf1f2 -amd64:debian:trixie==sha256:2c91e484d93f0830a7e05a2b9d92a7b102be7cab562198b984a84fdbc7806d91 -amd64:p4lang/behavioral-model:latest==sha256:ee8034f3f3d3b9bea7a7fd8edb5d1757bd4dc664d4e50113537e704f6cc8e8e5 -arm64:arm64v8/debian:bookworm==sha256:2886b9b2445fbcd18861eb83c3778ceae01f787eef05699808cd15497452094d -arm64:debian:bookworm==sha256:34e7f0ae7c10a61bfbef6e1b2ed205d9b47bb12e90c50696f729a5c7a01cf1f2 -arm64:debian:trixie==sha256:2c91e484d93f0830a7e05a2b9d92a7b102be7cab562198b984a84fdbc7806d91 -armhf:arm32v7/debian:bookworm==sha256:7ceb2095f7a687e7c6b05f4ffe5b45c49a5ac12f6212e6fc4d419a602aec8d35 -armhf:debian:bookworm==sha256:34e7f0ae7c10a61bfbef6e1b2ed205d9b47bb12e90c50696f729a5c7a01cf1f2 -armhf:debian:trixie==sha256:2c91e484d93f0830a7e05a2b9d92a7b102be7cab562198b984a84fdbc7806d91 +amd64:amd64/debian:bookworm==sha256:a63d3e06963db2ca35dac3d9a2edcfcaf5bda786db8dbf87da345b8c73aeffd4 +amd64:debian:bookworm==sha256:0a5bf4ecacfc050bad0131c8e1401063fd1e8343a418723f6dbd3cd13a7b9e33 +amd64:debian:trixie==sha256:3615a749858a1cba49b408fb49c37093db813321355a9ab7c1f9f4836341e9db +amd64:p4lang/behavioral-model:latest==sha256:ccbd16b807f93f1672e64fdcf1b9310c589fccd67174bc8dec1be3e6813684ad +arm64:arm64v8/debian:bookworm==sha256:140dcf8f88bd197d8a1193e15dfa6c78372deb244b2d3a2079f6e39ebb72d834 +arm64:debian:bookworm==sha256:0a5bf4ecacfc050bad0131c8e1401063fd1e8343a418723f6dbd3cd13a7b9e33 +arm64:debian:trixie==sha256:3615a749858a1cba49b408fb49c37093db813321355a9ab7c1f9f4836341e9db +armhf:arm32v7/debian:bookworm==sha256:67e6469f0ac5cea3141f1dad5c0dfd8be1f792f85265acfcd2cc8902f634f338 +armhf:debian:bookworm==sha256:0a5bf4ecacfc050bad0131c8e1401063fd1e8343a418723f6dbd3cd13a7b9e33 +armhf:debian:trixie==sha256:3615a749858a1cba49b408fb49c37093db813321355a9ab7c1f9f4836341e9db diff --git a/files/build/versions-public/default/versions-git b/files/build/versions-public/default/versions-git index 9b19eb54cb7..3e125099971 100644 --- a/files/build/versions-public/default/versions-git +++ b/files/build/versions-public/default/versions-git @@ -1,23 +1,21 @@ -https://github.com/aristanetworks/swi-tools.git==f1eb6920bf0b6fbecd8f1521a424c1f437db0af1 +https://github.com/aristanetworks/swi-tools.git==6db86f5983426d272e541a61e0add79b3fec5b1e https://github.com/CESNET/libyang-python.git==d8acc345aeb8d5b9644f7f2197ba6d8733e86378 https://github.com/CESNET/libyang.git==3d07c3a71534a580c3960907da17568eff7e5c64 https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6 https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 -https://github.com/facebook/tac_plus==dd38c2d727ff252ab2e1188c6d7087425376d845 -https://github.com/flashrom/flashrom.git==ad75e79a2b2fece98234667d7a21fc5f97118f2b -https://github.com/FreeRADIUS/freeradius-server.git==0a69ca18ff2e2ab5d51c52df9f87034d0006df4d +https://github.com/flashrom/flashrom.git==a59d3631fb3db9b9d7f4cb83b4022cdd518ff918 +https://github.com/FreeRADIUS/freeradius-server.git==51056205c87a30a401200a78f3058d49051e3d29 https://github.com/FreeRADIUS/pam_radius.git==d17fc655f0007728b67d0d25c0ca20b6048aa7a1 https://github.com/google/gnxi.git==612869a62faaaf2956ed60296ad801513ab62d29 https://github.com/jeroennijhof/pam_tacplus.git==b839c440e33c36eced9dcbc287fcfe6237c4c4ce -https://github.com/karimra/gnoic.git==2b416818af4946eecc3adc199713f20f39710f40 +https://github.com/karimra/gnoic.git==27bc5a65d391d07c903f6cd0a05b73219657e00d https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/openconfig/oc-pyang.git==a116b53b1c1a149bc9a5d42dc26f3d0ab797846a -https://github.com/redis/librdb.git==0615a0f59714a50310b69fd87c72e02ee7af47e6 -https://github.com/sflow/host-sflow==f64cf3f655e47fcea7dcefd224ce359b13d2ceb4 +https://github.com/redis/librdb.git==a7065962cf434da1a909aa45107dafa7e45b5057 +https://github.com/sflow/host-sflow==05be6bd61bd9926cd8a0e0d837a69165fd8add71 https://github.com/sflow/sflowtool==c4213f2ea91773b80628b1bebb9cd08bdec6612b https://github.com/sonic-net/DASH.git==62f9f0530609cc3420570f8f82c82f9bdeff1c32 https://salsa.debian.org/debian/monit.git==fae0a5c57cc8caed4d8c29202d528e535d3f4252 https://salsa.debian.org/grub-team/grub.git==4ab0b2ce97b35364da2b108523e18985f12da72a -https://salsa.debian.org/kernel-team/initramfs-tools.git==8c65a4965ee3529288c88565c7715692bfcd3422 -https://salsa.debian.org/tai271828/rasdaemon.git==51a7f485f8b2e2ae43e613f19c5a387595174132 +https://salsa.debian.org/tai271828/rasdaemon.git==f1f14bb053388d9b790bb9b09054deddb4e3b4fc diff --git a/files/build/versions-public/default/versions-mirror b/files/build/versions-public/default/versions-mirror index 59beb8f2afd..755fef04cc4 100644 --- a/files/build/versions-public/default/versions-mirror +++ b/files/build/versions-public/default/versions-mirror @@ -1,16 +1,16 @@ azure.archive.ubuntu.com_ubuntu_dists_focal==2020-04-23T17:33:17Z -azure.archive.ubuntu.com_ubuntu_dists_focal-backports==2026-02-21T22:38:09Z -azure.archive.ubuntu.com_ubuntu_dists_focal-security==2026-02-21T22:31:09Z -azure.archive.ubuntu.com_ubuntu_dists_focal-updates==2026-02-21T22:34:26Z -debian==20260221T001129Z -debian-security==20260221T001223Z -download.docker.com_linux_debian_dists_bookworm==2026-02-20T07:27:15Z -download.docker.com_linux_debian_dists_trixie==2026-02-20T07:27:15Z -packages.trafficmanager.net_snapshot_debian-security_20260221T001223Z_dists_bookworm-security==2026-02-20T21:43:09Z -packages.trafficmanager.net_snapshot_debian-security_20260221T001223Z_dists_trixie-security==2026-02-20T21:43:10Z -packages.trafficmanager.net_snapshot_debian_20260221T001129Z_dists_bookworm==2026-01-10T22:28:35Z -packages.trafficmanager.net_snapshot_debian_20260221T001129Z_dists_bookworm-backports==2026-02-20T20:17:00Z -packages.trafficmanager.net_snapshot_debian_20260221T001129Z_dists_bookworm-updates==2026-02-20T20:16:59Z -packages.trafficmanager.net_snapshot_debian_20260221T001129Z_dists_trixie==2026-01-10T10:28:38Z -packages.trafficmanager.net_snapshot_debian_20260221T001129Z_dists_trixie-backports==2026-02-20T20:17:00Z -packages.trafficmanager.net_snapshot_debian_20260221T001129Z_dists_trixie-updates==2026-02-20T20:16:59Z +azure.archive.ubuntu.com_ubuntu_dists_focal-backports==2026-03-14T20:52:26Z +azure.archive.ubuntu.com_ubuntu_dists_focal-security==2026-03-14T20:43:54Z +azure.archive.ubuntu.com_ubuntu_dists_focal-updates==2026-03-14T20:47:39Z +debian==20260314T001339Z +debian-security==20260314T001509Z +download.docker.com_linux_debian_dists_bookworm==2026-03-12T16:13:20Z +download.docker.com_linux_debian_dists_trixie==2026-03-12T16:13:20Z +packages.trafficmanager.net_snapshot_debian-security_20260314T001509Z_dists_bookworm-security==2026-03-13T11:27:19Z +packages.trafficmanager.net_snapshot_debian-security_20260314T001509Z_dists_trixie-security==2026-03-13T11:27:20Z +packages.trafficmanager.net_snapshot_debian_20260314T001339Z_dists_bookworm==2026-01-10T22:28:35Z +packages.trafficmanager.net_snapshot_debian_20260314T001339Z_dists_bookworm-backports==2026-03-13T20:09:50Z +packages.trafficmanager.net_snapshot_debian_20260314T001339Z_dists_bookworm-updates==2026-03-13T20:09:50Z +packages.trafficmanager.net_snapshot_debian_20260314T001339Z_dists_trixie==2026-01-10T10:28:38Z +packages.trafficmanager.net_snapshot_debian_20260314T001339Z_dists_trixie-backports==2026-03-13T20:09:50Z +packages.trafficmanager.net_snapshot_debian_20260314T001339Z_dists_trixie-updates==2026-03-13T20:09:50Z diff --git a/files/build/versions-public/default/versions-web b/files/build/versions-public/default/versions-web index de22a8aff33..c98856ff135 100644 --- a/files/build/versions-public/default/versions-web +++ b/files/build/versions-public/default/versions-web @@ -43,12 +43,14 @@ https://deb.debian.org/debian/pool/main/o/openssh/openssh_10.0p1.orig.tar.gz==68 https://deb.debian.org/debian/pool/main/o/openssh/openssh_10.0p1.orig.tar.gz.asc==1c0cb23a67bd4e5d25a8dc423ed65a5e https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 https://github.com/aristanetworks/sonic-firmware/raw/24716c4e03f223d8e18afff786ac427f6ac77fe0/phy/phy-credo_1.0_amd64.deb==14e233cd68bc5db22eb8c9e177242851 +https://github.com/bazelbuild/bazelisk/releases/download/v1.28.1/bazelisk-linux-amd64==2dc74b7ad6bdd6b6b08f6802d14fc1fd +https://github.com/bazelbuild/bazelisk/releases/download/v1.28.1/bazelisk-linux-arm64==94415d08ed2f86a49375f25a7f2f9cca https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64==2dc74b7ad6bdd6b6b08f6802d14fc1fd https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-arm64==94415d08ed2f86a49375f25a7f2f9cca https://github.com/CumulusNetworks/ifupdown2/archive/3.0.0-1.tar.gz==755459b3a58fbc11625336846cea7420 -https://github.com/fullstorydev/grpcurl/releases/download/v1.9.1/grpcurl_1.9.1_linux_x86_64.tar.gz==a263191ce012be65578b74613c688a3c -https://github.com/karimra/gnoic/releases/download/v0.2.0/checksums.txt==8c760c498ad8a61d0b4ad3207970f45f -https://github.com/karimra/gnoic/releases/download/v0.2.0/gnoic_0.2.0_linux_x86_64.tar.gz==253944c283b2cfc3abe7b65db2242ca9 +https://github.com/fullstorydev/grpcurl/releases/download/v1.9.3/grpcurl_1.9.3_linux_x86_64.tar.gz==d3be1623c525f281fc8e11bce5a09c8f +https://github.com/karimra/gnoic/releases/download/v0.2.1/checksums.txt==5f45b829aafe0d1b926470240d405b97 +https://github.com/karimra/gnoic/releases/download/v0.2.1/gnoic_0.2.1_linux_x86_64.tar.gz==28412ba68a3bd44cef86566726876832 https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh==2e8b2fb7d799d83acf895e20bd1966aa https://github.com/Mellanox/sonic-bluefield-packages/releases/download/dpu-bfsoc-4.14.0-13868-bookworm/mlxbf-bootctl_2.1_arm64.deb==74254c1e2ff1adcd1f89f50bf17797cc https://github.com/Mellanox/sonic-bluefield-packages/releases/download/dpu-bfsoc-4.14.0-13868-trixie/bfscripts_4.14.0-13868_all.deb==dc7f4beef8c471729fd8137b46016fbe @@ -94,24 +96,28 @@ https://github.com/Mellanox/sonic-bluefield-packages/releases/download/dpu-sdk-2 https://github.com/Mellanox/sonic-bluefield-packages/releases/download/dpu-sdk-26.1-RC3-trixie//mlnx-ofed-kernel-utils_26.01.OFED.26.01.0.2.9.1-1_arm64.deb==0a126b8ef09464af1f3333b8560a1f86 https://github.com/Mellanox/sonic-bluefield-packages/releases/download/dpu-sdk-26.1-RC3-trixie//mlnx-tools_2601.0.0-1_arm64.deb==e650c76c6a2c552cd21f24aa6c27527e https://github.com/Mellanox/sonic-bluefield-packages/releases/download/rshim-2.6.4-trixie-amd64/rshim_2.6.4_amd64.deb==dfe853a85c84c6cb178a35d457cf001f -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3404/fw-SPC-rel-13_2016_3404-EVB.mfa==170a2c36fb1e0854d3f30afe97a7b90c -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3404/fw-SPC2-rel-29_2016_3404-EVB.mfa==4c23c8e948e19c7873d69a2815394cd7 -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3404/fw-SPC3-rel-30_2016_3404-EVB.mfa==31b26a420c3392b042e30a6046b54008 -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3404/fw-SPC4-rel-34_2016_3404-EVB.mfa==6e5680450bd50b62c120a3a2eee61557 -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3404/fw-SPC5-rel-37_2016_3404-EVB.mfa==bca80fd75651c0725ffa2fcb134ee6ab -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-SAIBuild2511.35.3400.0-bookworm-amd64/mlnx-sai-dbgsym_1.mlnx.SAIBuild2511.35.3400.0_amd64.deb==c9fa3cfa4be5aa6f5046dbbc1b443cf0 -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-SAIBuild2511.35.3400.0-bookworm-amd64/mlnx-sai_1.mlnx.SAIBuild2511.35.3400.0_amd64.deb==2d150e80b50c583989c20a50fbade706 -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.8.3404-bookworm-amd64/sys-sdk_1.mlnx.4.8.3404_amd64-dev.deb==36e07aa1a5b078f642fa587f397b2ba5 -https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.8.3404-bookworm-amd64/sys-sdk_1.mlnx.4.8.3404_amd64.deb==538a2c2766c60833c517f379be94defe -https://github.com/Mellanox/Spectrum-SDK-Drivers/archive/refs/heads/4.8.3404.zip==1fd54fed22fdb125923498db4cc1971a +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3412/fw-SPC-rel-13_2016_3412-EVB.mfa==540be22af76a1a80062511954e8e25cc +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3412/fw-SPC2-rel-29_2016_3412-EVB.mfa==aae3bb18a045ef9fdcc16b5c5f5f6646 +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3412/fw-SPC3-rel-30_2016_3412-EVB.mfa==13426329fe117cba7d089a45b33c8f1b +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3412/fw-SPC4-rel-34_2016_3412-EVB.mfa==2bd1fd747b260428a2ea1ec64ce8f59a +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/fw-2016.3412/fw-SPC5-rel-37_2016_3412-EVB.mfa==ce7b693f2aa0fc91f12f66a21dcd4bbb +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-SAIBuild2511.35.3400.5-bookworm-amd64/mlnx-sai-dbgsym_1.mlnx.SAIBuild2511.35.3400.5_amd64.deb==dd2a0e453bb69db86cb951134cde16a7 +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sai-SAIBuild2511.35.3400.5-bookworm-amd64/mlnx-sai_1.mlnx.SAIBuild2511.35.3400.5_amd64.deb==aaefcf520530b3a229c0638119682dcb +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.8.3412-bookworm-amd64/sys-sdk_1.mlnx.4.8.3412_amd64-dev.deb==6a3ae035cce07903a8de3fdbf44fd6c6 +https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins/releases/download/sdk-4.8.3412-bookworm-amd64/sys-sdk_1.mlnx.4.8.3412_amd64.deb==9e3af598fd6c8fca46b0f488ef37bafb +https://github.com/Mellanox/Spectrum-SDK-Drivers/archive/refs/heads/4.8.3412.zip==d2221499be50f4c8d669f38769244f35 https://github.com/nanomsg/nanomsg/archive/1.2.2.tar.gz==22525d90e9e34099f8f25dfcf6515bfb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.144.0/otelcol-contrib_0.144.0_linux_amd64.deb==eb434c72277d208d0f2218da6666dd45 https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.144.0/otelcol-contrib_0.144.0_linux_arm64.deb==98ca208ac0f38b10611382add01ef98c https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.144.0/otelcol-contrib_0.144.0_linux_armv7.deb==65cbdc3debe9ac968be5d1e09aeaf9a1 https://github.com/seladb/PcapPlusPlus/archive/refs/tags/v24.09.tar.gz==5ae65d152e8b76390ce28806bc085ffd +https://raw.githubusercontent.com/openconfig/gnmi/master/proto/gnmi/gnmi.proto==8f354db5e671cf2cefd6aca7215038bf +https://raw.githubusercontent.com/openconfig/gnmi/master/proto/gnmi_ext/gnmi_ext.proto==bc166087e113759b1351a6412d3f0ec7 https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py==b16e05ede6aed78f7abadae1185f487d https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.3/openapi-generator-cli-4.2.3.jar==cda48eb414c8b4585e280c3fb2656e24 -https://sh.rustup.rs==ddcc91013258e42c0df0ec1c26c92359 -https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init==17d1313bdd6bbcfcec9344f6dd7e05ca -https://static.rust-lang.org/rustup/dist/armv7-unknown-linux-gnueabihf/rustup-init==e59124baaee31e5dce382b468f76c3e4 -https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init==b492784060539969a92e14663c0796d1 +https://salsa.debian.org/kernel-team/initramfs-tools/-/archive/v0.142/initramfs-tools-v0.142.tar.gz==a3765010fe0fc6a71fe900a798b759ea +https://sh.rustup.rs==f5b23855b2cbe6b44a3f82433e979992 +https://shrubbery.net/pub/tac_plus/tacacs-F4.0.4.31.tar.gz==20289f879d8f3457892aa2e23aa69eee +https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init==c37eeefaa45bbf75ada591d3c641a6f0 +https://static.rust-lang.org/rustup/dist/armv7-unknown-linux-gnueabihf/rustup-init==6c66f99d772fc8522706535cc66195b1 +https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init==a13dde59a1295a966c41031b1e7faa32 diff --git a/files/build/versions-public/dockers/docker-base-trixie/versions-deb-trixie b/files/build/versions-public/dockers/docker-base-trixie/versions-deb-trixie new file mode 100644 index 00000000000..190c2297ca5 --- /dev/null +++ b/files/build/versions-public/dockers/docker-base-trixie/versions-deb-trixie @@ -0,0 +1,98 @@ +adduser==3.152 +ca-certificates==20250419 +curl==8.14.1-2+deb13u2 +iproute2==6.15.0-1 +jq==1.7.1-6+deb13u1 +less==668-1 +libatomic1==14.2.0-19 +libbpf1==1:1.5.0-3 +libbrotli1==1.1.0-2+b7 +libcap2-bin==1:2.75-10+b3 +libcom-err2==1.47.2-3+b7 +libcurl4t64==8.14.1-2+deb13u2 +libdaemon0==0.14-7.1+b3 +libdbus-1-3==1.16.2-2 +libelf1t64==0.192-4 +libestr0==0.1.11-2 +libexpat1==2.7.1-2 +libfastjson4==1.2304.0-2 +libffi8==3.4.8-2 +libgdbm-compat4t64==1.24-2 +libgdbm6t64==1.24-2 +libgnutls30t64==3.8.9-3+deb13u2 +libgssapi-krb5-2==1.21.3-5+fips +libidn2-0==2.3.8-2 +libjansson4==2.14-2+b3 +libjemalloc2==5.3.0-3 +libjq1==1.7.1-6+deb13u1 +libk5crypto3==1.21.3-5+fips +libkeyutils1==1.6.3-6 +libkrb5-3==1.21.3-5+fips +libkrb5support0==1.21.3-5+fips +libldap2==2.6.10+dfsg-1 +liblognorm5==2.0.6-5 +liblzf1==3.6-4+b3 +libmnl0==1.0.5-3 +libncursesw6==6.5+20250216-2 +libnghttp2-14==1.64.0-1.1 +libnghttp3-9==1.8.0-1 +libnorm1t64==1.5.9+dfsg-3.1+b2 +libonig5==6.9.9-1+b1 +libp11-kit0==0.25.5-3 +libperl5.40==5.40.1-6 +libpgm-5.3-0t64==5.3.128~dfsg-2.1+b1 +libpopt0==1.19+dfsg-2 +libproc2-0==2:4.0.4-9 +libpsl5t64==0.21.2-1.1+b1 +libpython3-stdlib==3.13.5-1 +libpython3.13-minimal==3.13.5-2 +libpython3.13-stdlib==3.13.5-2 +libreadline8t64==8.2-6 +librtmp1==2.4+20151223.gitfa8646d.1-2+b5 +libsasl2-2==2.1.28+dfsg1-9 +libsasl2-modules-db==2.1.28+dfsg1-9 +libsodium23==1.0.18-1+deb13u1 +libssh2-1t64==1.11.1-1 +libssl-dev==3.5.4-1+fips +libssl3t64==3.5.4-1+fips +libtasn1-6==4.20.0-2 +libtirpc-common==1.3.6+ds-1 +libtirpc3t64==1.3.6+ds-1 +libunistring5==1.3-2 +libwrap0==7.6.q-36 +libxtables12==1.8.11-2 +libzmq5==4.3.5-1+b3 +media-types==13.0.0 +net-tools==2.10-1.3 +netbase==6.5 +openssl==3.5.4-1+fips +perl==5.40.1-6 +perl-modules-5.40==5.40.1-6 +procps==2:4.0.4-9 +python-is-python3==3.13.3-1 +python3==3.13.5-1 +python3-autocommand==2.2.2-3 +python3-inflect==7.3.1-2 +python3-jaraco.context==6.0.1-1 +python3-jaraco.functools==4.1.0-1 +python3-jaraco.text==4.0.0-1 +python3-minimal==3.13.5-1 +python3-more-itertools==10.7.0-1 +python3-packaging==25.0-1 +python3-pip==25.1.1+dfsg-1 +python3-pkg-resources==78.1.1-0.1 +python3-setuptools==78.1.1-0.1 +python3-typeguard==4.4.2-1 +python3-typing-extensions==4.13.2-1 +python3-wheel==0.46.1-2 +python3-zipp==3.21.0-1 +python3.13==3.13.5-2 +python3.13-minimal==3.13.5-2 +readline-common==8.2-6 +redis-tools==5:8.0.2-3+deb13u1 +rsync==3.4.1+ds1-5+deb13u1 +rsyslog==8.2504.0-1 +socat==1.7.4.1-3 +symcrypt-openssl==0.1 +vim-common==2:9.1.1230-2 +vim-tiny==2:9.1.1230-2 diff --git a/files/build/versions-public/dockers/docker-base-trixie/versions-py3 b/files/build/versions-public/dockers/docker-base-trixie/versions-py3 new file mode 100644 index 00000000000..32b8933b2af --- /dev/null +++ b/files/build/versions-public/dockers/docker-base-trixie/versions-py3 @@ -0,0 +1,24 @@ +attrs==25.4.0 +autocommand==2.2.2 +inflect==7.3.1 +jaraco.context==6.0.1 +jaraco.functools==4.1.0 +jaraco.text==4.0.0 +jinja2==3.1.6 +jinjanator==25.3.1 +jinjanator-plugins==25.1.0 +markupsafe==3.0.3 +more-itertools==10.7.0 +packaging==25.0 +pip==25.1.1 +pluggy==1.6.0 +python-dotenv==1.2.2 +pyyaml==6.0.3 +setuptools==78.1.1 +supervisor==4.3.0 +supervisord-dependent-startup==1.4.0 +toposort==1.10 +typeguard==4.4.2 +typing_extensions==4.13.2 +wheel==0.46.1 +zipp==3.21.0 diff --git a/files/build/versions-public/dockers/docker-bmp-watchdog/versions-deb-bookworm b/files/build/versions-public/dockers/docker-bmp-watchdog/versions-deb-bookworm index a0c1649c62f..a2995c0207a 100644 --- a/files/build/versions-public/dockers/docker-bmp-watchdog/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-bmp-watchdog/versions-deb-bookworm @@ -25,7 +25,7 @@ libxslt1.1==1.1.35-1+deb12u3 libyaml-0-2==0.2.5-1 libyang==1.0.73 libyang-cpp==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 python3-swsscommon==1.0.0 python3-yaml==6.0-3+b2 python3-yang==1.0.73 diff --git a/files/build/versions-public/dockers/docker-bmp-watchdog/versions-py3 b/files/build/versions-public/dockers/docker-bmp-watchdog/versions-py3 index 8930e0d56c1..ed14eef3cd5 100644 --- a/files/build/versions-public/dockers/docker-bmp-watchdog/versions-py3 +++ b/files/build/versions-public/dockers/docker-bmp-watchdog/versions-py3 @@ -1,7 +1,6 @@ async-timeout==5.0.1 bitarray==2.8.1 ijson==3.2.3 -ipaddress==1.0.23 jsondiff==2.2.1 jsonpointer==3.0.0 lxml==6.0.2 @@ -12,7 +11,7 @@ pyangbind==0.8.2 pyyaml==6.0.3 redis==5.0.1 redis-dump-load==1.1 -regex==2026.2.19 +regex==2026.2.28 six==1.17.0 tabulate==0.9.0 xmltodict==0.12.0 diff --git a/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-deb-bookworm b/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-deb-bookworm index 53a7b0722ba..185d5bde807 100644 --- a/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-deb-bookworm @@ -62,7 +62,7 @@ libxslt1.1==1.1.35-1+deb12u3 libyaml-0-2==0.2.5-1 libyang==1.0.73 libyang-cpp==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 make==4.3-4.1 patch==2.7.6-7 python3-swsscommon==1.0.0 diff --git a/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-py3 b/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-py3 index 8930e0d56c1..ed14eef3cd5 100644 --- a/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-py3 +++ b/files/build/versions-public/dockers/docker-config-engine-bookworm/versions-py3 @@ -1,7 +1,6 @@ async-timeout==5.0.1 bitarray==2.8.1 ijson==3.2.3 -ipaddress==1.0.23 jsondiff==2.2.1 jsonpointer==3.0.0 lxml==6.0.2 @@ -12,7 +11,7 @@ pyangbind==0.8.2 pyyaml==6.0.3 redis==5.0.1 redis-dump-load==1.1 -regex==2026.2.19 +regex==2026.2.28 six==1.17.0 tabulate==0.9.0 xmltodict==0.12.0 diff --git a/files/build/versions-public/dockers/docker-config-engine-trixie/versions-deb-trixie b/files/build/versions-public/dockers/docker-config-engine-trixie/versions-deb-trixie new file mode 100644 index 00000000000..9386ef2f402 --- /dev/null +++ b/files/build/versions-public/dockers/docker-config-engine-trixie/versions-deb-trixie @@ -0,0 +1,87 @@ +apt-utils==3.0.3 +binutils==2.44-3 +binutils-aarch64-linux-gnu==2.44-3 +binutils-common==2.44-3 +binutils-x86-64-linux-gnu==2.44-3 +bzip2==1.0.8-6 +cpp==4:14.2.0-1 +cpp-14==14.2.0-19 +cpp-14-aarch64-linux-gnu==14.2.0-19 +cpp-14-x86-64-linux-gnu==14.2.0-19 +cpp-aarch64-linux-gnu==4:14.2.0-1 +cpp-x86-64-linux-gnu==4:14.2.0-1 +dpkg-dev==1.22.21 +g++==4:14.2.0-1 +g++-14==14.2.0-19 +g++-14-aarch64-linux-gnu==14.2.0-19 +g++-14-x86-64-linux-gnu==14.2.0-19 +g++-aarch64-linux-gnu==4:14.2.0-1 +g++-x86-64-linux-gnu==4:14.2.0-1 +gcc==4:14.2.0-1 +gcc-14==14.2.0-19 +gcc-14-aarch64-linux-gnu==14.2.0-19 +gcc-14-x86-64-linux-gnu==14.2.0-19 +gcc-aarch64-linux-gnu==4:14.2.0-1 +gcc-x86-64-linux-gnu==4:14.2.0-1 +libasan8==14.2.0-19 +libbinutils==2.44-3 +libboost-serialization1.83.0==1.83.0-4.2 +libc-dev-bin==2.41-12+deb13u1 +libc6-dev==2.41-12+deb13u1 +libcc1-0==14.2.0-19 +libcrypt-dev==1:4.4.38-1 +libctf-nobfd0==2.44-3 +libctf0==2.44-3 +libdpkg-perl==1.22.21 +libexpat1-dev==2.7.1-2 +libgcc-14-dev==14.2.0-19 +libgcrypt20==1.11.0-7 +libgomp1==14.2.0-19 +libgpg-error0==1.51-4 +libgprofng0==2.44-3 +libhiredis1.1.0==1.2.0-6+b3 +libhwasan0==14.2.0-19 +libisl23==0.27-1 +libitm1==14.2.0-19 +libjs-jquery==3.6.1+dfsg+~3.5.14-1 +libjs-sphinxdoc==8.1.3-5 +libjs-underscore==1.13.4~dfsg+~1.11.4-3 +liblsan0==14.2.0-19 +libmpc3==1.3.1-1+b3 +libmpfr6==4.2.2-1 +libnl-3-200==3.7.0-0.2+b1sonic1 +libnl-cli-3-200==3.7.0-0.2+b1sonic1 +libnl-genl-3-200==3.7.0-0.2+b1sonic1 +libnl-nf-3-200==3.7.0-0.2+b1sonic1 +libnl-route-3-200==3.7.0-0.2+b1sonic1 +libpcre3==2:8.39-15 +libpython3-dev==3.13.5-1 +libpython3.13==3.13.5-2 +libpython3.13-dev==3.13.5-2 +libquadmath0==14.2.0-19 +libsframe1==2.44-3 +libstdc++-14-dev==14.2.0-19 +libswsscommon==1.0.0 +libtsan2==14.2.0-19 +libubsan1==14.2.0-19 +libxml2==2.12.7+dfsg+really2.9.14-2.1+deb13u2 +libxml2-dev==2.12.7+dfsg+really2.9.14-2.1+deb13u2 +libxslt1-dev==1.1.35-1.2+deb13u2 +libxslt1.1==1.1.35-1.2+deb13u2 +libyaml-0-2==0.2.5-2 +libyang==1.0.73 +libyang-cpp==1.0.73 +linux-libc-dev==6.12.74-2 +make==4.4.1-2 +patch==2.8-2 +python3-redis==6.1.0-2 +python3-swsscommon==1.0.0 +python3-yaml==6.0.2-1+b2 +python3-yang==1.0.73 +python3.13-dev==3.13.5-2 +rpcsvc-proto==1.4.3-1+b1 +sonic-db-cli==1.0.0 +sonic-eventd==1.0.0-0 +sonic-supervisord-utilities-rs==1.0.0 +xz-utils==5.8.1-1 +zlib1g-dev==1:1.3.dfsg+really1.3.1-1+b1 diff --git a/files/build/versions-public/dockers/docker-config-engine-trixie/versions-deb-trixie-armhf b/files/build/versions-public/dockers/docker-config-engine-trixie/versions-deb-trixie-armhf new file mode 100644 index 00000000000..5dbbf7467cb --- /dev/null +++ b/files/build/versions-public/dockers/docker-config-engine-trixie/versions-deb-trixie-armhf @@ -0,0 +1,8 @@ +binutils-arm-linux-gnueabihf==2.44-3 +cpp-14-arm-linux-gnueabihf==14.2.0-19 +cpp-arm-linux-gnueabihf==4:14.2.0-1 +g++-14-arm-linux-gnueabihf==14.2.0-19 +g++-arm-linux-gnueabihf==4:14.2.0-1 +gcc-14-arm-linux-gnueabihf==14.2.0-19 +gcc-arm-linux-gnueabihf==4:14.2.0-1 +rpcsvc-proto==1.4.3-1 diff --git a/files/build/versions-public/dockers/docker-config-engine-trixie/versions-py3 b/files/build/versions-public/dockers/docker-config-engine-trixie/versions-py3 new file mode 100644 index 00000000000..5fc2cf2e8dc --- /dev/null +++ b/files/build/versions-public/dockers/docker-config-engine-trixie/versions-py3 @@ -0,0 +1,14 @@ +bitarray==2.8.1 +ijson==3.2.3 +jsondiff==2.2.1 +jsonpointer==3.0.0 +lxml==6.0.2 +natsort==8.4.0 +netaddr==0.8.0 +pyang==2.7.1 +pyangbind==0.8.7 +redis==6.1.0 +redis-dump-load==1.1 +regex==2026.2.28 +tabulate==0.9.0 +xmltodict==0.12.0 diff --git a/files/build/versions-public/dockers/docker-database/versions-deb-trixie b/files/build/versions-public/dockers/docker-database/versions-deb-trixie new file mode 100644 index 00000000000..fa777f6e152 --- /dev/null +++ b/files/build/versions-public/dockers/docker-database/versions-deb-trixie @@ -0,0 +1,38 @@ +gdb==16.3-1 +gdbserver==16.3-1 +libbabeltrace1==1.5.11-4+b2 +libcbor0.10==0.10.2-2 +libcurl3t64-gnutls==8.14.1-2+deb13u2 +libdashapi==1.0.0 +libdebuginfod-common==0.192-4 +libdebuginfod1t64==0.192-4 +libdw1t64==0.192-4 +libedit2==3.1-20250104-1 +libfido2-1==1.15.0-1+b1 +libglib2.0-0t64==2.84.4-3~deb13u2 +libgpm2==1.20.7-11+b2 +libipt2==2.1.2-1 +libjson-c5==0.18+ds-1 +libmpfr6==4.2.2-1 +libngtcp2-16==1.11.0-1 +libngtcp2-crypto-gnutls8==1.11.0-1 +libprotobuf32t64==3.21.12-11 +libsource-highlight-common==3.1.9-4.3 +libsource-highlight4t64==3.1.9-4.3+b1 +libswsscommon-dbgsym==1.0.0 +libtext-charwidth-perl==0.04-11+b4 +libtext-wrapi18n-perl==0.06-10 +libunwind8==1.8.1-0.1 +libyang-cpp-dbgsym==1.0.73 +openssh-client==1:10.0p1-7+fips +python3-swsscommon-dbgsym==1.0.0 +python3-yang-dbgsym==1.0.73 +redis-server==5:8.0.2-3+deb13u1 +sensible-utils==0.0.25 +sonic-db-cli-dbgsym==1.0.0 +sonic-eventd-dbgsym==1.0.0-0 +sshpass==1.10-0.1 +strace==6.13+ds-1 +ucf==3.0052 +vim==2:9.1.1230-2 +vim-runtime==2:9.1.1230-2 diff --git a/files/build/versions-public/dockers/docker-dhcp-relay/versions-deb-bookworm b/files/build/versions-public/dockers/docker-dhcp-relay/versions-deb-bookworm index bf344135ace..4942700b6b9 100644 --- a/files/build/versions-public/dockers/docker-dhcp-relay/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-dhcp-relay/versions-deb-bookworm @@ -73,7 +73,7 @@ libtsan2==12.2.0-14+deb12u1 libubsan1==12.2.0-14+deb12u1 libunwind8==1.6.2-3 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 lsof==4.95.0-1 make==4.3-4.1 openssh-client==1:9.2p1-2+deb12u5+fips diff --git a/files/build/versions-public/dockers/docker-dhcp-server/versions-deb-bookworm b/files/build/versions-public/dockers/docker-dhcp-server/versions-deb-bookworm index f70fd6f0ee4..631059b6417 100644 --- a/files/build/versions-public/dockers/docker-dhcp-server/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-dhcp-server/versions-deb-bookworm @@ -66,7 +66,7 @@ libtsan2==12.2.0-14+deb12u1 libubsan1==12.2.0-14+deb12u1 libunwind8==1.6.2-3 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 make==4.3-4.1 mariadb-common==1:10.11.14-0+deb12u2 mysql-common==5.8+1.1.0 diff --git a/files/build/versions-public/dockers/docker-fpm-frr/versions-py3 b/files/build/versions-public/dockers/docker-fpm-frr/versions-py3 index 8b6fbe16b81..cf39afa6b4c 100644 --- a/files/build/versions-public/dockers/docker-fpm-frr/versions-py3 +++ b/files/build/versions-public/dockers/docker-fpm-frr/versions-py3 @@ -1,2 +1 @@ pyyaml==6.0.1 -zipp==1.2.0 diff --git a/files/build/versions-public/dockers/docker-gbsyncd-agera2/versions-deb-bookworm b/files/build/versions-public/dockers/docker-gbsyncd-agera2/versions-deb-bookworm index f1f9b7d6599..dea820107b2 100644 --- a/files/build/versions-public/dockers/docker-gbsyncd-agera2/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-gbsyncd-agera2/versions-deb-bookworm @@ -21,7 +21,7 @@ libnsl-dev==1.3.0-2 libprotobuf-dev==3.21.12-3 libprotobuf-lite32==3.21.12-3 libprotobuf32==3.21.12-3 -libsaiagera2==3.14.0-2 +libsaiagera2==3.14.0-4 libsaimetadata==1.0.0 libsairedis==1.0.0 libsource-highlight-common==3.1.9-4.2 @@ -32,7 +32,7 @@ libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.3+ds-1 libunwind8==1.6.2-3 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 openssh-client==1:9.2p1-2+deb12u5+fips openssl==3.0.18-1~deb12u2 python3-swsscommon-dbgsym==1.0.0 diff --git a/files/build/versions-public/dockers/docker-gbsyncd-broncos/versions-deb-bookworm b/files/build/versions-public/dockers/docker-gbsyncd-broncos/versions-deb-bookworm index f58010706b4..47a1019091e 100644 --- a/files/build/versions-public/dockers/docker-gbsyncd-broncos/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-gbsyncd-broncos/versions-deb-bookworm @@ -32,7 +32,7 @@ libswsscommon-dbgsym==1.0.0 libtirpc-dev==1.3.3+ds-1 libunwind8==1.6.2-3 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 openssh-client==1:9.2p1-2+deb12u5+fips openssl==3.0.18-1~deb12u2 python3-swsscommon-dbgsym==1.0.0 diff --git a/files/build/versions-public/dockers/docker-gbsyncd-vs/versions-deb-bookworm b/files/build/versions-public/dockers/docker-gbsyncd-vs/versions-deb-bookworm index 11cf969b3c7..3d062e228ff 100644 --- a/files/build/versions-public/dockers/docker-gbsyncd-vs/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-gbsyncd-vs/versions-deb-bookworm @@ -167,7 +167,7 @@ libnl-3-dev==3.7.0-0.2+b1sonic1 libnl-route-3-dev==3.7.0-0.2+b1sonic1 libnsl-dev==1.3.0-2 libnspr4==2:4.35-1 -libnss3==2:3.87.1-1+deb12u1 +libnss3==2:3.87.1-1+deb12u2 libnuma-dev==2.0.16-1 libnuma1==2.0.16-1 libobjc-12-dev==12.2.0-14+deb12u1 @@ -230,7 +230,7 @@ libxml2==2.9.14+dfsg-1.3~deb12u5 libxnvctrl0==525.85.05-3~deb12u1 libyang-cpp-dbgsym==1.0.73 libz3-4==4.8.12-3.1 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 llvm==1:14.0-55.7~deb12u1 llvm-14==1:14.0.6-12 llvm-14-linker-tools==1:14.0.6-12 diff --git a/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-deb-bookworm b/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-deb-bookworm index a0c1649c62f..a2995c0207a 100644 --- a/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-deb-bookworm @@ -25,7 +25,7 @@ libxslt1.1==1.1.35-1+deb12u3 libyaml-0-2==0.2.5-1 libyang==1.0.73 libyang-cpp==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 python3-swsscommon==1.0.0 python3-yaml==6.0-3+b2 python3-yang==1.0.73 diff --git a/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-py3 b/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-py3 index 8930e0d56c1..ed14eef3cd5 100644 --- a/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-py3 +++ b/files/build/versions-public/dockers/docker-gnmi-watchdog/versions-py3 @@ -1,7 +1,6 @@ async-timeout==5.0.1 bitarray==2.8.1 ijson==3.2.3 -ipaddress==1.0.23 jsondiff==2.2.1 jsonpointer==3.0.0 lxml==6.0.2 @@ -12,7 +11,7 @@ pyangbind==0.8.2 pyyaml==6.0.3 redis==5.0.1 redis-dump-load==1.1 -regex==2026.2.19 +regex==2026.2.28 six==1.17.0 tabulate==0.9.0 xmltodict==0.12.0 diff --git a/files/build/versions-public/dockers/docker-platform-monitor/versions-deb-bookworm b/files/build/versions-public/dockers/docker-platform-monitor/versions-deb-bookworm index bf2e1cf3a8e..eed875fd5cc 100644 --- a/files/build/versions-public/dockers/docker-platform-monitor/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-platform-monitor/versions-deb-bookworm @@ -115,7 +115,7 @@ libxext6==2:1.3.4-1+b1 libxml2==2.9.14+dfsg-1.3~deb12u5 libxrender1==1:0.9.10-1.1 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 lm-sensors==1:3.6.0-7.1 lm-sensors-dbgsym==1:3.6.0-7.1 make==4.3-4.1 @@ -128,10 +128,7 @@ patch==2.7.6-7 pci.ids==0.0~2023.04.11-1 pciutils==1:3.9.0-4 psmisc==23.6-1 -python3-attr==22.2.0-1 -python3-jsonschema==4.10.3-1 python3-netifaces==0.11.0-2+b1 -python3-pyrsistent==0.18.1-1+b3 python3-smbus==4.3-2+b3 python3-swsscommon-dbgsym==1.0.0 python3-yang-dbgsym==1.0.73 diff --git a/files/build/versions-public/dockers/docker-platform-monitor/versions-py3 b/files/build/versions-public/dockers/docker-platform-monitor/versions-py3 index 9a403159892..c6fcdec69ee 100644 --- a/files/build/versions-public/dockers/docker-platform-monitor/versions-py3 +++ b/files/build/versions-public/dockers/docker-platform-monitor/versions-py3 @@ -1,8 +1,7 @@ -attrs==22.2.0 blkinfo==0.2.0 build==1.4.0 -certifi==2026.1.4 -charset-normalizer==3.4.4 +certifi==2026.2.25 +charset-normalizer==3.4.5 enum34==1.1.10 grpcio==1.51.1 grpcio-tools==1.51.1 @@ -16,7 +15,6 @@ packaging==26.0 protobuf==4.25.8 psutil==7.2.2 pyproject_hooks==1.2.0 -pyrsistent==0.18.1 requests==2.32.5 smbus2==0.6.0 thrift==0.13.0 diff --git a/files/build/versions-public/dockers/docker-ptf/versions-deb-bookworm b/files/build/versions-public/dockers/docker-ptf/versions-deb-bookworm index 5b44d43aabb..27eb6babc2e 100644 --- a/files/build/versions-public/dockers/docker-ptf/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-ptf/versions-deb-bookworm @@ -399,7 +399,7 @@ libnsl-dev==1.3.0-2 libnsl2==1.3.0-2 libnspr4==2:4.35-1 libnss-systemd==252.39-1~deb12u1 -libnss3==2:3.87.1-1+deb12u1 +libnss3==2:3.87.1-1+deb12u2 libnuma-dev==2.0.16-1 libnuma1==2.0.16-1 libobjc-12-dev==12.2.0-14+deb12u1 @@ -591,7 +591,7 @@ libyaml-0-2==0.2.5-1 libyuv0==0.0~git20230123.b2528b0-1 libz3-4==4.8.12-3.1 libz3-dev==4.8.12-3.1 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 llvm==1:14.0-55.7~deb12u1 llvm-14==1:14.0.6-12 llvm-14-dev==1:14.0.6-12 diff --git a/files/build/versions-public/dockers/docker-ptf/versions-py3 b/files/build/versions-public/dockers/docker-ptf/versions-py3 index 4fc5d71523b..db18237b015 100644 --- a/files/build/versions-public/dockers/docker-ptf/versions-py3 +++ b/files/build/versions-public/dockers/docker-ptf/versions-py3 @@ -11,8 +11,8 @@ enum34==1.1.10 exabgp==4.2.25 executing==2.2.1 flask==3.1.3 -grpcio==1.78.1 -grpcio-tools==1.78.1 +grpcio==1.78.0 +grpcio-tools==1.78.0 invoke==2.2.1 ipaddress==1.0.23 ipython==9.10.0 @@ -28,11 +28,11 @@ paramiko==4.0.0 parso==0.8.6 pexpect==4.9.0 pickleshare==0.7.5 -pip==23.0.1 +pip==26.0.1 plumbum==1.10.0 prompt-toolkit==1.0.18 prompt_toolkit==3.0.52 -protobuf==3.20.3 +protobuf==6.31.1 ptyprocess==0.7.0 pure_eval==0.2.3 pyaml==26.2.1 @@ -50,13 +50,13 @@ rpyc==6.0.2 saithrift==0.9 scapy==2.7.0 serpent==1.42 -setuptools==51.0.0 +setuptools==65.5.1 simplegeneric==0.8.1 six==1.17.0 stack-data==0.6.3 supervisor==4.3.0 thrift==0.22.0 -tornado==6.5.4 +tornado==6.5.5 traitlets==5.14.3 typing_extensions==4.15.0 unittest-xml-reporting==4.0.0 diff --git a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm deleted file mode 100644 index f566a120dd1..00000000000 --- a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm +++ /dev/null @@ -1,36 +0,0 @@ -gdb==13.1-3 -gdbserver==13.1-3 -libbabeltrace1==1.5.11-1+b2 -libboost-regex1.74.0==1.74.0+ds1-21 -libcbor0.8==0.8.0-2+b1 -libcurl3-gnutls==7.88.1-10+deb12u14 -libdebuginfod-common==0.188-2.1 -libdebuginfod1==0.188-2.1 -libdw1==0.188-2.1 -libedit2==3.1-20221030-2 -libfido2-1==1.12.0-2+b1 -libglib2.0-0==2.74.6-2+deb12u8 -libgpm2==1.20.7-10+b1 -libicu72==72.1-3+deb12u1 -libipt2==2.0.5-1 -libmpfr6==4.2.0-1 -libsource-highlight-common==3.1.9-4.2 -libsource-highlight4v5==3.1.9-4.2+b3 -libssl-dev==3.0.18-1~deb12u2 -libssl3==3.0.18-1~deb12u2 -libswsscommon-dbgsym==1.0.0 -libunwind8==1.6.2-3 -libyang-cpp-dbgsym==1.0.73 -openssh-client==1:9.2p1-2+deb12u5+fips -openssl==3.0.18-1~deb12u2 -python3-swsscommon-dbgsym==1.0.0 -python3-yang-dbgsym==1.0.73 -radvd==1:2.19-1+b1 -sensible-utils==0.0.17+nmu1 -sonic-db-cli-dbgsym==1.0.0 -sonic-eventd-dbgsym==1.0.0-0 -sshpass==1.09-1+b1 -strace==6.1-0.1 -ucf==3.0043+nmu1+deb12u1 -vim==2:9.0.1378-2+deb12u2 -vim-runtime==2:9.0.1378-2+deb12u2 diff --git a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm-arm64 b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm-arm64 deleted file mode 100644 index 122e75fd733..00000000000 --- a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm-arm64 +++ /dev/null @@ -1 +0,0 @@ -radvd==1:2.19-1 diff --git a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm-armhf b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm-armhf deleted file mode 100644 index 122e75fd733..00000000000 --- a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-bookworm-armhf +++ /dev/null @@ -1 +0,0 @@ -radvd==1:2.19-1 diff --git a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie new file mode 100644 index 00000000000..15e2fbdf26e --- /dev/null +++ b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie @@ -0,0 +1,36 @@ +gdb==16.3-1 +gdbserver==16.3-1 +libbabeltrace1==1.5.11-4+b2 +libcbor0.10==0.10.2-2 +libcurl3t64-gnutls==8.14.1-2+deb13u2 +libdebuginfod-common==0.192-4 +libdebuginfod1t64==0.192-4 +libdw1t64==0.192-4 +libedit2==3.1-20250104-1 +libfido2-1==1.15.0-1+b1 +libglib2.0-0t64==2.84.4-3~deb13u2 +libgpm2==1.20.7-11+b2 +libipt2==2.1.2-1 +libjson-c5==0.18+ds-1 +libmpfr6==4.2.2-1 +libngtcp2-16==1.11.0-1 +libngtcp2-crypto-gnutls8==1.11.0-1 +libsource-highlight-common==3.1.9-4.3 +libsource-highlight4t64==3.1.9-4.3+b1 +libswsscommon-dbgsym==1.0.0 +libtext-charwidth-perl==0.04-11+b4 +libtext-wrapi18n-perl==0.06-10 +libunwind8==1.8.1-0.1 +libyang-cpp-dbgsym==1.0.73 +openssh-client==1:10.0p1-7+fips +python3-swsscommon-dbgsym==1.0.0 +python3-yang-dbgsym==1.0.73 +radvd==1:2.20-1+b1 +sensible-utils==0.0.25 +sonic-db-cli-dbgsym==1.0.0 +sonic-eventd-dbgsym==1.0.0-0 +sshpass==1.10-0.1 +strace==6.13+ds-1 +ucf==3.0052 +vim==2:9.1.1230-2 +vim-runtime==2:9.1.1230-2 diff --git a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie-arm64 b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie-arm64 new file mode 100644 index 00000000000..747b644b6b0 --- /dev/null +++ b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie-arm64 @@ -0,0 +1 @@ +radvd==1:2.20-1 diff --git a/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie-armhf b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie-armhf new file mode 100644 index 00000000000..747b644b6b0 --- /dev/null +++ b/files/build/versions-public/dockers/docker-router-advertiser/versions-deb-trixie-armhf @@ -0,0 +1 @@ +radvd==1:2.20-1 diff --git a/files/build/versions-public/dockers/docker-snmp/versions-deb-bookworm b/files/build/versions-public/dockers/docker-snmp/versions-deb-bookworm index 5f96e08587d..1e5396c5f18 100644 --- a/files/build/versions-public/dockers/docker-snmp/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-snmp/versions-deb-bookworm @@ -62,7 +62,7 @@ libtsan2==12.2.0-14+deb12u1 libubsan1==12.2.0-14+deb12u1 libunwind8==1.6.2-3 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 openssh-client==1:9.2p1-2+deb12u5+fips openssl==3.0.18-1~deb12u2 pci.ids==0.0~2023.04.11-1 diff --git a/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-deb-bookworm b/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-deb-bookworm index f145c9566c5..047f5bf991d 100644 --- a/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-deb-bookworm @@ -60,7 +60,7 @@ libubsan1==12.2.0-14+deb12u1 libunwind8==1.6.2-3 libxml2==2.9.14+dfsg-1.3~deb12u5 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 openssh-client==1:9.2p1-2+deb12u5+fips openssl==3.0.18-1~deb12u2 python3-swsscommon-dbgsym==1.0.0 diff --git a/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-py3 index 58bb7e7aac5..ed67d3d3ae2 100644 --- a/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions-public/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -1,5 +1,5 @@ -certifi==2026.1.4 -charset-normalizer==3.4.4 +certifi==2026.2.25 +charset-normalizer==3.4.5 idna==3.11 requests==2.32.5 urllib3==2.6.3 diff --git a/files/build/versions-public/dockers/docker-sonic-vs/versions-deb-bookworm b/files/build/versions-public/dockers/docker-sonic-vs/versions-deb-bookworm index 005b586712c..cb346479aea 100644 --- a/files/build/versions-public/dockers/docker-sonic-vs/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-sonic-vs/versions-deb-bookworm @@ -88,7 +88,7 @@ libxml2==2.9.14+dfsg-1.3~deb12u5 libxml2-dev==2.9.14+dfsg-1.3~deb12u5 libyang3==3.12.2-1 libzmq3-dev==4.3.4-6 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 logrotate==3.21.0-1 lsof==4.95.0-1 ndisc6==1.0.5-1+b2 diff --git a/files/build/versions-public/dockers/docker-sonic-vs/versions-py3 b/files/build/versions-public/dockers/docker-sonic-vs/versions-py3 index 37f690b5d61..b9d6eabd6dd 100644 --- a/files/build/versions-public/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions-public/dockers/docker-sonic-vs/versions-py3 @@ -1,8 +1,8 @@ bcrypt==5.0.0 -blessed==1.30.0 -certifi==2026.1.4 +blessed==1.33.0 +certifi==2026.2.25 cffi==2.0.0 -charset-normalizer==3.4.4 +charset-normalizer==3.4.5 click==8.1.8 click-log==0.4.0 colorful==0.5.8 @@ -11,9 +11,10 @@ dbus-python==1.4.0 docker==7.1.0 docker-image-py==0.1.13 enlighten==1.14.1 -filelock==3.24.3 +filelock==3.25.2 idna==3.11 invoke==2.2.1 +ipaddress==1.0.23 jsonpatch==1.33 lazy-object-proxy==1.12.0 m2crypto==0.47.0 @@ -23,7 +24,7 @@ paramiko==4.0.0 pexpect==4.9.0 prefixed==0.9.0 prettyprinter==0.18.0 -protobuf==6.33.5 +protobuf==7.34.0 psutil==7.2.2 ptyprocess==0.7.0 pyangbind==0.8.1 diff --git a/files/build/versions-public/dockers/docker-swss-layer-trixie/versions-deb-trixie b/files/build/versions-public/dockers/docker-swss-layer-trixie/versions-deb-trixie new file mode 100644 index 00000000000..3e25197a1a2 --- /dev/null +++ b/files/build/versions-public/dockers/docker-swss-layer-trixie/versions-deb-trixie @@ -0,0 +1,8 @@ +iputils-ping==3:20240905-3 +libdashapi==1.0.0 +libprotobuf32t64==3.21.12-11 +libsaimetadata==1.0.0 +libsairedis==1.0.0 +libteam5==1.31-1 +libteamdctl0==1.31-1 +swss==1.0.0 diff --git a/files/build/versions-public/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bookworm b/files/build/versions-public/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bookworm index ae7246b0304..3cd406d9010 100644 --- a/files/build/versions-public/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-syncd-brcm-dnx-rpc/versions-deb-bookworm @@ -55,7 +55,7 @@ libtsan2==12.2.0-14+deb12u1 libubsan1==12.2.0-14+deb12u1 libuv1==1.44.2-1+deb12u1 libxml2==2.9.14+dfsg-1.3~deb12u5 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 make==4.3-4.1 netbase==6.4 openssl==3.0.18-1~deb12u2 diff --git a/files/build/versions-public/dockers/docker-database/versions-deb-bookworm b/files/build/versions-public/dockers/docker-syncd-brcm-legacy-th/versions-deb-bookworm similarity index 81% rename from files/build/versions-public/dockers/docker-database/versions-deb-bookworm rename to files/build/versions-public/dockers/docker-syncd-brcm-legacy-th/versions-deb-bookworm index e729177fe01..bdf093bd7b5 100644 --- a/files/build/versions-public/dockers/docker-database/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-syncd-brcm-legacy-th/versions-deb-bookworm @@ -1,10 +1,11 @@ +ethtool==1:6.1-1 gdb==13.1-3 gdbserver==13.1-3 +kmod==30+20221128-1 libbabeltrace1==1.5.11-1+b2 libboost-regex1.74.0==1.74.0+ds1-21 libcbor0.8==0.8.0-2+b1 libcurl3-gnutls==7.88.1-10+deb12u14 -libdashapi==1.0.0 libdebuginfod-common==0.188-2.1 libdebuginfod1==0.188-2.1 libdw1==0.188-2.1 @@ -14,8 +15,13 @@ libglib2.0-0==2.74.6-2+deb12u8 libgpm2==1.20.7-10+b1 libicu72==72.1-3+deb12u1 libipt2==2.0.5-1 +libkmod2==30+20221128-1 libmpfr6==4.2.0-1 libprotobuf32==3.21.12-3 +libsaimetadata==1.0.0 +libsaimetadata-dbgsym==1.0.0 +libsairedis==1.0.0 +libsairedis-dbgsym==1.0.0 libsource-highlight-common==3.1.9-4.2 libsource-highlight4v5==3.1.9-4.2+b3 libssl-dev==3.0.18-1~deb12u2 @@ -23,16 +29,19 @@ libssl3==3.0.18-1~deb12u2 libswsscommon-dbgsym==1.0.0 libunwind8==1.6.2-3 libyang-cpp-dbgsym==1.0.73 +lz4==1.9.4-1 openssh-client==1:9.2p1-2+deb12u5+fips openssl==3.0.18-1~deb12u2 python3-swsscommon-dbgsym==1.0.0 python3-yang-dbgsym==1.0.73 -redis-server==5:7.0.15-1~deb12u6 sensible-utils==0.0.17+nmu1 sonic-db-cli-dbgsym==1.0.0 sonic-eventd-dbgsym==1.0.0-0 sshpass==1.09-1+b1 +sswsyncd==1.0.0 strace==6.1-0.1 +syncd==1.0.0 +syncd-dbgsym==1.0.0 ucf==3.0043+nmu1+deb12u1 vim==2:9.0.1378-2+deb12u2 vim-runtime==2:9.0.1378-2+deb12u2 diff --git a/files/build/versions-public/dockers/docker-syncd-brcm-rpc/versions-deb-bookworm b/files/build/versions-public/dockers/docker-syncd-brcm-rpc/versions-deb-bookworm index ae7246b0304..3cd406d9010 100644 --- a/files/build/versions-public/dockers/docker-syncd-brcm-rpc/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-syncd-brcm-rpc/versions-deb-bookworm @@ -55,7 +55,7 @@ libtsan2==12.2.0-14+deb12u1 libubsan1==12.2.0-14+deb12u1 libuv1==1.44.2-1+deb12u1 libxml2==2.9.14+dfsg-1.3~deb12u5 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 make==4.3-4.1 netbase==6.4 openssl==3.0.18-1~deb12u2 diff --git a/files/build/versions-public/dockers/docker-syncd-mlnx-rpc/versions-deb-bookworm b/files/build/versions-public/dockers/docker-syncd-mlnx-rpc/versions-deb-bookworm index 8d68cecd6e2..83abbdbc3a0 100644 --- a/files/build/versions-public/dockers/docker-syncd-mlnx-rpc/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-syncd-mlnx-rpc/versions-deb-bookworm @@ -54,7 +54,7 @@ libtirpc-dev==1.3.3+ds-1 libtsan2==12.2.0-14+deb12u1 libubsan1==12.2.0-14+deb12u1 libuv1==1.44.2-1+deb12u1 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 make==4.3-4.1 netbase==6.4 openssl==3.0.18-1~deb12u2 diff --git a/files/build/versions-public/dockers/docker-syncd-mlnx/versions-deb-bookworm b/files/build/versions-public/dockers/docker-syncd-mlnx/versions-deb-bookworm index ad67abe74ce..0bd57979535 100644 --- a/files/build/versions-public/dockers/docker-syncd-mlnx/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-syncd-mlnx/versions-deb-bookworm @@ -41,10 +41,10 @@ libtirpc-dev==1.3.3+ds-1 libunwind8==1.6.2-3 libxml2==2.9.14+dfsg-1.3~deb12u5 libyang-cpp-dbgsym==1.0.73 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 mft==4.34.0-145 mft-fwtrace-cfg==1.0.0 -mlnx-sai==1.mlnx.SAIBuild2511.35.3400.0 +mlnx-sai==1.mlnx.SAIBuild2511.35.3400.5 openssh-client==1:9.2p1-2+deb12u5+fips openssl==3.0.18-1~deb12u2 pci.ids==0.0~2023.04.11-1 @@ -63,7 +63,7 @@ sshpass==1.09-1+b1 strace==6.1-0.1 syncd==1.0.0 syncd-dbgsym==1.0.0 -sys-sdk-main==1.mlnx.4.8.3404 +sys-sdk-main==1.mlnx.4.8.3412 ucf==3.0043+nmu1+deb12u1 vim==2:9.0.1378-2+deb12u2 vim-runtime==2:9.0.1378-2+deb12u2 diff --git a/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-arm64 b/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-arm64 index b3241687801..8bbc39eb1ff 100644 --- a/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-arm64 +++ b/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-arm64 @@ -12,7 +12,7 @@ libpython3-dev==3.11.2-1+b1 libpython3.11-dev==3.11.2-6+deb12u6 libsaimetadata==1.0.0 libsairedis==1.0.0 -mrvllibsai==1.16.1-3 +mrvllibsai==1.17.1-1 pkg-config==1.8.1-1 pkgconf==1.8.1-1 pkgconf-bin==1.8.1-1 diff --git a/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-armhf b/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-armhf index b3241687801..8bbc39eb1ff 100644 --- a/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-armhf +++ b/files/build/versions-public/dockers/docker-syncd-mrvl-prestera/versions-deb-bookworm-armhf @@ -12,7 +12,7 @@ libpython3-dev==3.11.2-1+b1 libpython3.11-dev==3.11.2-6+deb12u6 libsaimetadata==1.0.0 libsairedis==1.0.0 -mrvllibsai==1.16.1-3 +mrvllibsai==1.17.1-1 pkg-config==1.8.1-1 pkgconf==1.8.1-1 pkgconf-bin==1.8.1-1 diff --git a/files/build/versions-public/dockers/docker-syncd-vs/versions-deb-bookworm b/files/build/versions-public/dockers/docker-syncd-vs/versions-deb-bookworm index 11cf969b3c7..3d062e228ff 100644 --- a/files/build/versions-public/dockers/docker-syncd-vs/versions-deb-bookworm +++ b/files/build/versions-public/dockers/docker-syncd-vs/versions-deb-bookworm @@ -167,7 +167,7 @@ libnl-3-dev==3.7.0-0.2+b1sonic1 libnl-route-3-dev==3.7.0-0.2+b1sonic1 libnsl-dev==1.3.0-2 libnspr4==2:4.35-1 -libnss3==2:3.87.1-1+deb12u1 +libnss3==2:3.87.1-1+deb12u2 libnuma-dev==2.0.16-1 libnuma1==2.0.16-1 libobjc-12-dev==12.2.0-14+deb12u1 @@ -230,7 +230,7 @@ libxml2==2.9.14+dfsg-1.3~deb12u5 libxnvctrl0==525.85.05-3~deb12u1 libyang-cpp-dbgsym==1.0.73 libz3-4==4.8.12-3.1 -linux-libc-dev==6.1.162-1 +linux-libc-dev==6.1.164-1 llvm==1:14.0-55.7~deb12u1 llvm-14==1:14.0.6-12 llvm-14-linker-tools==1:14.0.6-12 diff --git a/files/build/versions-public/dockers/docker-teamd/versions-deb-bookworm b/files/build/versions-public/dockers/docker-teamd/versions-deb-bookworm deleted file mode 100644 index 78f68ae3bc9..00000000000 --- a/files/build/versions-public/dockers/docker-teamd/versions-deb-bookworm +++ /dev/null @@ -1,39 +0,0 @@ -gdb==13.1-3 -gdbserver==13.1-3 -libbabeltrace1==1.5.11-1+b2 -libboost-regex1.74.0==1.74.0+ds1-21 -libcbor0.8==0.8.0-2+b1 -libcurl3-gnutls==7.88.1-10+deb12u14 -libdebuginfod-common==0.188-2.1 -libdebuginfod1==0.188-2.1 -libdw1==0.188-2.1 -libedit2==3.1-20221030-2 -libfido2-1==1.12.0-2+b1 -libglib2.0-0==2.74.6-2+deb12u8 -libgpm2==1.20.7-10+b1 -libicu72==72.1-3+deb12u1 -libipt2==2.0.5-1 -libmpfr6==4.2.0-1 -libsource-highlight-common==3.1.9-4.2 -libsource-highlight4v5==3.1.9-4.2+b3 -libssl-dev==3.0.18-1~deb12u2 -libssl3==3.0.18-1~deb12u2 -libswsscommon-dbgsym==1.0.0 -libteam-utils==1.31-1 -libteam-utils-dbgsym==1.31-1 -libteamdctl0-dbgsym==1.31-1 -libunwind8==1.6.2-3 -libyang-cpp-dbgsym==1.0.73 -openssh-client==1:9.2p1-2+deb12u5+fips -openssl==3.0.18-1~deb12u2 -python3-swsscommon-dbgsym==1.0.0 -python3-yang-dbgsym==1.0.73 -sensible-utils==0.0.17+nmu1 -sonic-db-cli-dbgsym==1.0.0 -sonic-eventd-dbgsym==1.0.0-0 -sshpass==1.09-1+b1 -strace==6.1-0.1 -swss-dbg==1.0.0 -ucf==3.0043+nmu1+deb12u1 -vim==2:9.0.1378-2+deb12u2 -vim-runtime==2:9.0.1378-2+deb12u2 diff --git a/files/build/versions-public/dockers/docker-teamd/versions-deb-trixie b/files/build/versions-public/dockers/docker-teamd/versions-deb-trixie new file mode 100644 index 00000000000..922991d824e --- /dev/null +++ b/files/build/versions-public/dockers/docker-teamd/versions-deb-trixie @@ -0,0 +1,39 @@ +gdb==16.3-1 +gdbserver==16.3-1 +libbabeltrace1==1.5.11-4+b2 +libcbor0.10==0.10.2-2 +libcurl3t64-gnutls==8.14.1-2+deb13u2 +libdebuginfod-common==0.192-4 +libdebuginfod1t64==0.192-4 +libdw1t64==0.192-4 +libedit2==3.1-20250104-1 +libfido2-1==1.15.0-1+b1 +libglib2.0-0t64==2.84.4-3~deb13u2 +libgpm2==1.20.7-11+b2 +libipt2==2.1.2-1 +libjson-c5==0.18+ds-1 +libmpfr6==4.2.2-1 +libngtcp2-16==1.11.0-1 +libngtcp2-crypto-gnutls8==1.11.0-1 +libsource-highlight-common==3.1.9-4.3 +libsource-highlight4t64==3.1.9-4.3+b1 +libswsscommon-dbgsym==1.0.0 +libteam-utils==1.31-1 +libteam-utils-dbgsym==1.31-1 +libteamdctl0-dbgsym==1.31-1 +libtext-charwidth-perl==0.04-11+b4 +libtext-wrapi18n-perl==0.06-10 +libunwind8==1.8.1-0.1 +libyang-cpp-dbgsym==1.0.73 +openssh-client==1:10.0p1-7+fips +python3-swsscommon-dbgsym==1.0.0 +python3-yang-dbgsym==1.0.73 +sensible-utils==0.0.25 +sonic-db-cli-dbgsym==1.0.0 +sonic-eventd-dbgsym==1.0.0-0 +sshpass==1.10-0.1 +strace==6.13+ds-1 +swss-dbg==1.0.0 +ucf==3.0052 +vim==2:9.1.1230-2 +vim-runtime==2:9.1.1230-2 diff --git a/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm b/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm index e20fc7a416d..33274679783 100644 --- a/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm +++ b/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm @@ -44,6 +44,7 @@ bzip2==1.0.8-5+b1 bzip2-doc==1.0.8-5 ca-certificates==20230311+deb12u1 ca-certificates-java==20230710~deb12u1 +ccache==4.8+really4.7.5-1 cdbs==0.4.166 check==0.15.2-2+b1 chrpath==0.16-2+b1 @@ -110,7 +111,7 @@ docbook-xml==4.5-12 docker-buildx-plugin==0.10.5-1~debian.12~bookworm docker-ce==5:24.0.2-1~debian.12~bookworm docker-ce-cli==5:24.0.2-1~debian.12~bookworm -docker-ce-rootless-extras==5:29.2.1-1~debian.12~bookworm +docker-ce-rootless-extras==5:29.3.0-1~debian.12~bookworm docker-compose-plugin==2.18.1-1~debian.12~bookworm docutils-common==0.19+dfsg-6 dosfstools==4.2-1 @@ -225,9 +226,9 @@ i965-va-driver==2.4.1+dfsg1-1 ibverbs-providers==44.0-2 icc-profiles-free==2.0.1+dfsg-1.1 icu-devtools==72.1-3+deb12u1 -imagemagick==8:6.9.11.60+dfsg-1.6+deb12u6 -imagemagick-6-common==8:6.9.11.60+dfsg-1.6+deb12u6 -imagemagick-6.q16==8:6.9.11.60+dfsg-1.6+deb12u6 +imagemagick==8:6.9.11.60+dfsg-1.6+deb12u7 +imagemagick-6-common==8:6.9.11.60+dfsg-1.6+deb12u7 +imagemagick-6.q16==8:6.9.11.60+dfsg-1.6+deb12u7 inetutils-telnet==2:2.4-2+deb12u2 inkscape==1.2.2-2+b1 install-info==6.8-6+b1 @@ -727,7 +728,6 @@ libgmock-dev==1.12.1-0.2 libgmp-dev==2:6.2.1+dfsg1-1.1 libgmpxx4ldbl==2:6.2.1+dfsg1-1.1 libgnutls-dane0==3.7.9-2+deb12u6 -libgnutls30==3.7.9-2+deb12u6 libgomp1==12.2.0-14+deb12u1 libgomp1-armhf-cross==12.2.0-14cross1 libgoogle-perftools4==2.10-1 @@ -810,8 +810,8 @@ libidn12==1.41-1 libiec61883-0==1.2.0-6+b1 libigdgmm12==22.3.3+ds1-1 libijs-0.35==0.35-15 -libimage-magick-perl==8:6.9.11.60+dfsg-1.6+deb12u6 -libimage-magick-q16-perl==8:6.9.11.60+dfsg-1.6+deb12u6 +libimage-magick-perl==8:6.9.11.60+dfsg-1.6+deb12u7 +libimage-magick-q16-perl==8:6.9.11.60+dfsg-1.6+deb12u7 libimagequant0==2.17.0-1 libimath-3-1-29==3.1.6-1 libimport-into-perl==1.002005-2 @@ -936,10 +936,10 @@ liblzo2-2==2.10-2 liblzo2-dev==2.10-2 libmagic-mgc==1:5.44-3 libmagic1==1:5.44-3 -libmagick++-6.q16-8==8:6.9.11.60+dfsg-1.6+deb12u6 -libmagickcore-6.q16-6==8:6.9.11.60+dfsg-1.6+deb12u6 -libmagickcore-6.q16-6-extra==8:6.9.11.60+dfsg-1.6+deb12u6 -libmagickwand-6.q16-6==8:6.9.11.60+dfsg-1.6+deb12u6 +libmagick++-6.q16-8==8:6.9.11.60+dfsg-1.6+deb12u7 +libmagickcore-6.q16-6==8:6.9.11.60+dfsg-1.6+deb12u7 +libmagickcore-6.q16-6-extra==8:6.9.11.60+dfsg-1.6+deb12u7 +libmagickwand-6.q16-6==8:6.9.11.60+dfsg-1.6+deb12u7 libmail-sendmail-perl==0.80-3 libmailtools-perl==2.21-2 libmariadb-dev==1:10.11.14-0+deb12u2 @@ -1013,7 +1013,6 @@ libnetaddr-ip-perl==4.079+dfsg-2+b1 libnetfilter-conntrack-dev==1.0.9-3 libnetfilter-conntrack3==1.0.9-3 libnetpbm11==2:11.01.00-2 -libnetsnmptrapd40==5.9.3+dfsg-2+deb12u1 libnewt-dev==0.52.23-1+b1 libnewt0.52==0.52.23-1+b1 libnfnetlink-dev==1.0.2-2 @@ -1035,7 +1034,7 @@ libnsl-dev==1.3.0-2 libnsl2==1.3.0-2 libnspr4==2:4.35-1 libnss-systemd==252.39-1~deb12u1 -libnss3==2:3.87.1-1+deb12u1 +libnss3==2:3.87.1-1+deb12u2 libnuma-dev==2.0.16-1 libnuma1==2.0.16-1 libnumber-compare-perl==0.03-3 @@ -1275,10 +1274,6 @@ libsnappy-jni==1.1.8.3-1 libsnappy1v5==1.1.9-3 libsndfile1==1.2.0-1+deb12u1 libsndio7.0==1.9.0-0.3+b2 -libsnmp-base==5.9.3+dfsg-2+deb12u1 -libsnmp-dev==5.9.3+dfsg-2+deb12u1 -libsnmp-perl==5.9.3+dfsg-2+deb12u1 -libsnmp40==5.9.3+dfsg-2+deb12u1 libsoap-lite-perl==1.27-3 libsocket6-perl==0.29-3 libsodium-dev==1.0.18-1+deb12u1 @@ -1590,14 +1585,14 @@ libzvbi0==0.2.41-1 libzzip-0-13==0.13.72+dfsg.1-1.1 licensecheck==3.3.5-1 lintian==2.116.3+deb12u1 -linux-compiler-gcc-12-x86==6.1.162-1 -linux-headers-6.1.0-43-amd64==6.1.162-1 -linux-headers-6.1.0-43-arm64==6.1.162-1 -linux-headers-6.1.0-43-common==6.1.162-1 -linux-headers-amd64==6.1.162-1 -linux-headers-arm64==6.1.162-1 -linux-kbuild-6.1==6.1.162-1 -linux-libc-dev==6.1.162-1 +linux-compiler-gcc-12-x86==6.1.164-1 +linux-headers-6.1.0-44-amd64==6.1.164-1 +linux-headers-6.1.0-44-arm64==6.1.164-1 +linux-headers-6.1.0-44-common==6.1.164-1 +linux-headers-amd64==6.1.164-1 +linux-headers-arm64==6.1.164-1 +linux-kbuild-6.1==6.1.164-1 +linux-libc-dev==6.1.164-1 linuxdoc-tools==0.9.82-1 llvm==1:14.0-55.7~deb12u1 llvm-14==1:14.0.6-12 @@ -1704,12 +1699,12 @@ php-text-template==2.0.4-2 php-timer==5.0.3-3 php-tokenizer==1.2.1-1 php-xml==2:8.2+93 -php8.2-cli==8.2.29-1~deb12u1 -php8.2-common==8.2.29-1~deb12u1 -php8.2-mbstring==8.2.29-1~deb12u1 -php8.2-opcache==8.2.29-1~deb12u1 -php8.2-readline==8.2.29-1~deb12u1 -php8.2-xml==8.2.29-1~deb12u1 +php8.2-cli==8.2.30-1~deb12u1 +php8.2-common==8.2.30-1~deb12u1 +php8.2-mbstring==8.2.30-1~deb12u1 +php8.2-opcache==8.2.30-1~deb12u1 +php8.2-readline==8.2.30-1~deb12u1 +php8.2-xml==8.2.30-1~deb12u1 phpunit==9.6.7-1 phpunit-cli-parser==1.0.1-3 phpunit-code-unit==1.0.8-3 diff --git a/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm-armhf b/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm-armhf index d969533810c..5519adc4d58 100644 --- a/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm-armhf +++ b/files/build/versions-public/dockers/sonic-slave-bookworm/versions-deb-bookworm-armhf @@ -1,3 +1,3 @@ -linux-compiler-gcc-12-arm==6.1.162-1 -linux-headers-6.1.0-43-armmp==6.1.162-1 -linux-headers-armmp==6.1.162-1 +linux-compiler-gcc-12-arm==6.1.164-1 +linux-headers-6.1.0-44-armmp==6.1.164-1 +linux-headers-armmp==6.1.164-1 diff --git a/files/build/versions-public/dockers/sonic-slave-bookworm/versions-py3 b/files/build/versions-public/dockers/sonic-slave-bookworm/versions-py3 index a33fe921b8c..1a3ed6d2465 100644 --- a/files/build/versions-public/dockers/sonic-slave-bookworm/versions-py3 +++ b/files/build/versions-public/dockers/sonic-slave-bookworm/versions-py3 @@ -111,7 +111,7 @@ pyasn1==0.4.8 pyasn1-modules==0.2.8 pycparser==2.21 pyelftools==0.29 -pyfakefs==6.1.1 +pyfakefs==6.1.4 pygments==2.14.0 pygobject==3.42.2 pyhamcrest==2.0.3 @@ -132,8 +132,8 @@ pytz==2022.7.1 pyxdg==0.28 pyyaml==6.0 pyyaml-include==2.2 -redis==7.2.0 -regex==2026.2.19 +redis==7.3.0 +regex==2026.2.28 requests==2.28.1 roman==3.3 scapy==2.5.0 diff --git a/files/build/versions-public/dockers/sonic-slave-trixie/versions-deb-trixie b/files/build/versions-public/dockers/sonic-slave-trixie/versions-deb-trixie index 116123a2997..83576ed0ff5 100644 --- a/files/build/versions-public/dockers/sonic-slave-trixie/versions-deb-trixie +++ b/files/build/versions-public/dockers/sonic-slave-trixie/versions-deb-trixie @@ -48,6 +48,7 @@ bzip2==1.0.8-6 bzip2-doc==1.0.8-6 ca-certificates==20250419 ca-certificates-java==20240118 +ccache==4.11.2-2 cdbs==0.4.173 check==0.15.2-3 chrpath==0.18-1 @@ -59,7 +60,7 @@ cmake==3.31.6-2 cmake-data==3.31.6-2 cmocka-doc==1.1.7-3 comerr-dev==2.1-1.47.2-3+b7 -containerd.io==1.6.21-1 +containerd.io==1.7.28-2~debian.13~trixie cowbuilder==0.90+b1 cowdancer==0.90+b1 cpio==2.15+dfsg-2 @@ -118,11 +119,11 @@ docbook-dsssl==1.79-10 docbook-to-man==1:2.0.0-48 docbook-utils==0.6.14-4 docbook-xml==4.5-13 -docker-buildx-plugin==0.10.5-1~debian.12~bookworm -docker-ce==5:24.0.2-1~debian.12~bookworm -docker-ce-cli==5:24.0.2-1~debian.12~bookworm -docker-ce-rootless-extras==5:29.2.1-1~debian.12~bookworm -docker-compose-plugin==2.18.1-1~debian.12~bookworm +docker-buildx-plugin==0.26.1-1~debian.13~trixie +docker-ce==5:28.5.2-1~debian.13~trixie +docker-ce-cli==5:28.5.2-1~debian.13~trixie +docker-ce-rootless-extras==5:29.3.0-1~debian.13~trixie +docker-compose-plugin==2.39.1-1~debian.13~trixie docutils-common==0.21.2+dfsg-2 dosfstools==4.2-1.2 doxygen==1.9.8+ds-2.1 @@ -259,9 +260,9 @@ hwdata==0.394-1 i965-va-driver==2.4.1+dfsg1-2 ibverbs-providers==56.1-1 icu-devtools==76.1-4 -imagemagick==8:7.1.1.43+dfsg1-1+deb13u5 -imagemagick-7-common==8:7.1.1.43+dfsg1-1+deb13u5 -imagemagick-7.q16==8:7.1.1.43+dfsg1-1+deb13u5 +imagemagick==8:7.1.1.43+dfsg1-1+deb13u6 +imagemagick-7-common==8:7.1.1.43+dfsg1-1+deb13u6 +imagemagick-7.q16==8:7.1.1.43+dfsg1-1+deb13u6 inetutils-telnet==2:2.6-3+deb13u2 inkscape==1.4-6 install-info==7.1.1-1+b1 @@ -924,8 +925,8 @@ libidn2-dev==2.3.8-2 libiec61883-0==1.2.0-7 libigdgmm12==22.7.2+ds1-1 libijs-0.35==0.35-15.2 -libimage-magick-perl==8:7.1.1.43+dfsg1-1+deb13u5 -libimage-magick-q16-perl==8:7.1.1.43+dfsg1-1+deb13u5 +libimage-magick-perl==8:7.1.1.43+dfsg1-1+deb13u6 +libimage-magick-q16-perl==8:7.1.1.43+dfsg1-1+deb13u6 libimagequant0==2.18.0-1+b2 libimath-3-1-29t64==3.1.12-1+b3 libimport-into-perl==1.002005-2 @@ -1053,9 +1054,9 @@ liblzo2-2==2.10-3+b1 liblzo2-dev==2.10-3+b1 libmagic-mgc==1:5.46-5 libmagic1t64==1:5.46-5 -libmagickcore-7.q16-10==8:7.1.1.43+dfsg1-1+deb13u5 -libmagickcore-7.q16-10-extra==8:7.1.1.43+dfsg1-1+deb13u5 -libmagickwand-7.q16-10==8:7.1.1.43+dfsg1-1+deb13u5 +libmagickcore-7.q16-10==8:7.1.1.43+dfsg1-1+deb13u6 +libmagickcore-7.q16-10-extra==8:7.1.1.43+dfsg1-1+deb13u6 +libmagickwand-7.q16-10==8:7.1.1.43+dfsg1-1+deb13u6 libmail-sendmail-perl==0.80-3 libmailtools-perl==2.22-1 libmariadb-dev==1:11.8.3-0+deb13u1 @@ -1159,7 +1160,7 @@ libnpth0t64==1.8-3 libnsl2==1.3.0-3+b3 libnspr4==2:4.36-1 libnss-systemd==257.9-1~deb13u1 -libnss3==2:3.110-1 +libnss3==2:3.110-1+deb13u1 libnuma-dev==2.0.19-1 libnuma1==2.0.19-1 libnumber-compare-perl==0.03-3 @@ -1746,7 +1747,7 @@ libzzip-0-13t64==0.13.78+dfsg.1-0.1 licensecheck==3.3.9-1 lintian==2.122.0 linux-base==4.12 -linux-libc-dev==6.12.73-1 +linux-libc-dev==6.12.74-2 linux-sysctl-defaults==4.12 linuxdoc-tools==0.9.86-1 llvm==1:19.0-63 diff --git a/files/build/versions-public/dockers/sonic-slave-trixie/versions-py3 b/files/build/versions-public/dockers/sonic-slave-trixie/versions-py3 index b8b8888d61b..f9401250266 100644 --- a/files/build/versions-public/dockers/sonic-slave-trixie/versions-py3 +++ b/files/build/versions-public/dockers/sonic-slave-trixie/versions-py3 @@ -7,7 +7,6 @@ automat==25.4.16 babel==2.17.0 bcrypt==4.2.0 beautifulsoup4==4.13.4 -bitarray==3.8.0 blessed==1.21.0 blkinfo==0.2.0 bottleneck==1.4.2 @@ -121,13 +120,13 @@ pure_eval==0.2.3 puremagic==1.28 py-cpuinfo==9.0.0 pyang==2.4.0 -pyangbind==0.8.2 +pyangbind==0.8.7 pyasn1==0.6.1 pyasn1_modules==0.4.1 pycparser==2.22 pycryptodomex==3.20.0 pyelftools==0.32 -pyfakefs==6.1.1 +pyfakefs==6.1.4 pygments==2.18.0 pygobject==3.50.0 pyhamcrest==2.1.0 @@ -151,7 +150,7 @@ pytz==2025.2 pyxdg==0.28 pyyaml==6.0.2 pyyaml-include==2.2 -redis==7.2.0 +redis==7.3.0 regex==2024.11.6 requests==2.32.3 roman==5.0 diff --git a/files/build/versions-public/host-image/versions-deb-trixie b/files/build/versions-public/host-image/versions-deb-trixie index 40adbb2ceb5..f8dc5b08769 100644 --- a/files/build/versions-public/host-image/versions-deb-trixie +++ b/files/build/versions-public/host-image/versions-deb-trixie @@ -22,7 +22,7 @@ ca-certificates==20250419 cgroup-tools==3.1.0-2+b2 chrony==4.6.1-3 conntrack==1:1.4.8-2+b1 -containerd.io==1.7.27-1 +containerd.io==1.7.28-2~debian.13~trixie cpio==2.15+dfsg-2 cpp==4:14.2.0-1 cpp-14==14.2.0-19 @@ -43,8 +43,8 @@ device-tree-compiler==1.7.2-2+b1 distro-info-data==0.66+deb13u1 dmidecode==3.6-2 dmsetup==2:1.02.205-2 -docker-ce==5:28.2.2-1~debian.13~trixie -docker-ce-cli==5:28.2.2-1~debian.13~trixie +docker-ce==5:28.5.2-1~debian.13~trixie +docker-ce-cli==5:28.5.2-1~debian.13~trixie dpkg-dev==1.22.21 e2fsprogs==1.47.2-3+b7 eatmydata==131-2 @@ -80,7 +80,7 @@ grub2-common==2.06-13+deb13u1 haveged==1.9.19-12 hdparm==9.65+ds-1.1 hping3==3.a2.ds2-10.1 -hw-management==1.mlnx.7.0050.2930 +hw-management==1.mlnx.7.0050.3002 i2c-tools==4.4-2 ifmetric==0.3-5+b1 ifupdown2==3.0.0-1 @@ -211,6 +211,7 @@ libncursesw6==6.5+20250216-2 libnet1==1.3+dfsg-2 libnetfilter-conntrack3==1.1.0-1 libnfnetlink0==1.0.2-3 +libnftables1==1.1.3-1 libnftnl11==1.2.9-1 libnghttp2-14==1.64.0-1.1 libnghttp3-9==1.8.0-1 @@ -324,8 +325,8 @@ libzmq5==4.3.5-1+b3 linux-base==4.12 linux-image-6.12.41+deb13-sonic-amd64-unsigned==6.12.41-1 linux-image-6.12.41+deb13-sonic-arm64-unsigned==6.12.41-1 -linux-libc-dev==6.12.73-1 -linux-perf==6.12.73-1 +linux-libc-dev==6.12.74-2 +linux-perf==6.12.74-2 linux-sysctl-defaults==4.12 locales==2.41-12+deb13u1 logrotate==3.22.0-1+b2 @@ -352,9 +353,9 @@ ndisc6==1.0.7-1+b1 net-tools==2.10-1.3 netbase==6.5 netfilter-persistent==1.0.23 +nftables==1.1.3-1 nslcd==0.9.13-1 nvme-cli==2.13-2 -opennsl-modules==7.1.0.0 openssh-client==1:10.0p1-7+fips openssh-server==1:10.0p1-7+fips openssh-sftp-server==1:10.0p1-7+fips @@ -406,6 +407,7 @@ python3-pip==25.1.1+dfsg-1 python3-pkg-resources==78.1.1-0.1 python3-ply==3.11-9 python3-prefixed==0.7.0-1 +python3-psutil==7.0.0-2 python3-pycparser==2.22-2 python3-regex==0.1.20241106-1+b1 python3-requests==2.32.3+dfsg-5 @@ -449,7 +451,7 @@ sqlite3==3.46.1-7 squashfs-tools==1:4.6.1-1+b1 ssh==1:10.0p1-7+fips sudo==1.9.16p2-3 -sx-kernel==1.mlnx.4.8.3404 +sx-kernel==1.mlnx.4.8.3412 symcrypt-openssl==0.1 sysfsutils==2.1.1-7 syslog-counter==1.0.0 @@ -469,6 +471,7 @@ ucf==3.0052 udev==257.9-1~deb13u1 unzip==6.0-29 usbutils==1:018-2 +util-linux-extra==2.41-5 uuid-runtime==2.41-5 vim==2:9.1.1230-2 vim-common==2:9.1.1230-2 diff --git a/files/build/versions-public/host-image/versions-py3 b/files/build/versions-public/host-image/versions-py3 index d3493381b27..f12876acd79 100644 --- a/files/build/versions-public/host-image/versions-py3 +++ b/files/build/versions-public/host-image/versions-py3 @@ -7,10 +7,10 @@ bitarray==2.8.1 blessed==1.21.0 blkinfo==0.2.0 build==1.4.0 -certifi==2026.1.4 +certifi==2026.2.25 cffi==1.17.1 chardet==5.2.0 -charset-normalizer==3.4.4 +charset-normalizer==3.4.5 click==8.1.8 click-log==0.4.0 colorful==0.5.8 @@ -19,7 +19,7 @@ dbus-python==1.4.0 docker==7.1.0 docker-image-py==0.1.13 enlighten==1.11.2 -filelock==3.24.3 +filelock==3.25.2 grpcio==1.66.2 grpcio-tools==1.66.2 idna==3.11 @@ -58,7 +58,7 @@ protobuf==5.29.6 psutil==7.2.2 ptyprocess==0.7.0 pyang==2.7.1 -pyangbind==0.8.2 +pyangbind==0.8.7 pycairo==1.26.1 pycparser==2.22 pygments==2.19.2 @@ -80,7 +80,7 @@ six==1.17.0 smbus2==0.6.0 systemd-python==235 tabulate==0.9.0 -telnetlib3==2.6.0 +telnetlib3==4.0.1 toposort==1.6 typeguard==4.4.2 typing_extensions==4.13.2 diff --git a/files/build/versions-public/host-image/versions-py3-all-armhf b/files/build/versions-public/host-image/versions-py3-all-armhf index 20abe985289..481f748fe74 100644 --- a/files/build/versions-public/host-image/versions-py3-all-armhf +++ b/files/build/versions-public/host-image/versions-py3-all-armhf @@ -1 +1 @@ -protobuf==6.33.5 +protobuf==7.34.0 diff --git a/platform/marvell-teralynx/platform-modules-wistron.mk b/platform/marvell-teralynx/platform-modules-wistron.mk index ed0c8922c1b..edae0102cbb 100644 --- a/platform/marvell-teralynx/platform-modules-wistron.mk +++ b/platform/marvell-teralynx/platform-modules-wistron.mk @@ -11,9 +11,9 @@ $(WISTRON_SW_TO3200K_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADER $(WISTRON_SW_TO3200K_PLATFORM_MODULE)_PLATFORM = x86_64-wistron_sw_to3200k-r0 WISTRON_6512_32R_PLATFORM_MODULE = sonic-platform-wistron-6512-32r_$(WISTRON_6512_32R_PLATFORM_MODULE_VERSION)_$(CONFIGURED_ARCH).deb -$(WISTRON_6512_32R_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-wistron $(WISTRON_6512_32R_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(WISTRON_6512_32R_PLATFORM_MODULE)_PLATFORM = x86_64-wistron_6512_32r-r0 +$(eval $(call add_derived_package,$(WISTRON_SW_TO3200K_PLATFORM_MODULE),$(WISTRON_6512_32R_PLATFORM_MODULE))) WISTRON_PLATFORM_MODULE = $(WISTRON_SW_TO3200K_PLATFORM_MODULE) $(WISTRON_6512_32R_PLATFORM_MODULE) -SONIC_DPKG_DEBS += $(WISTRON_PLATFORM_MODULE) +SONIC_DPKG_DEBS += $(WISTRON_SW_TO3200K_PLATFORM_MODULE) diff --git a/platform/vpp b/platform/vpp index 5f31ccf4a59..b020b836628 160000 --- a/platform/vpp +++ b/platform/vpp @@ -1 +1 @@ -Subproject commit 5f31ccf4a599abf4feb7e018b87b931ea53878ef +Subproject commit b020b83662899a311815aab506c0fa7a7813f239 diff --git a/rules/config b/rules/config index 3e1ea29911e..52861900db2 100644 --- a/rules/config +++ b/rules/config @@ -396,3 +396,10 @@ BUILD_SKIP_TEST ?= n # but may use stale layers if base images changed without version bumps. # Recommended for local development; CI should leave this disabled. # SONIC_CONFIG_USE_DOCKER_CACHE = y + +# SONIC_CONFIG_USE_CCACHE - use ccache to speed up C/C++ compilation +# When enabled, ccache caches compilation results so that rebuilds of +# unchanged source files are near-instant. The cache is stored in +# target/ccache/ and persists across builds. +# Default: disabled (no impact on clean builds without a warm cache) +SONIC_CONFIG_USE_CCACHE ?= n diff --git a/rules/sairedis.mk b/rules/sairedis.mk index b4ae9cfb447..26e96f1c645 100644 --- a/rules/sairedis.mk +++ b/rules/sairedis.mk @@ -8,10 +8,6 @@ $(LIBSAIREDIS)_SRC_PATH = $(SRC_PATH)/sonic-sairedis $(LIBSAIREDIS)_VERSION = $(LIBSAIREDIS_VERSION) $(LIBSAIREDIS)_NAME = $(LIBSAIREDIS_NAME) $(LIBSAIREDIS)_DEPENDS += $(LIBSWSSCOMMON_DEV) -ifeq ($(CONFIGURED_PLATFORM),vpp) -$(LIBSAIREDIS)_DEPENDS += $(VPP_MAIN) $(VPP_PLUGIN_CORE) $(VPP_PLUGIN_DPDK) \ - $(VPP_PLUGIN_DEV) $(VPP_DEV) $(VPPINFRA_DEV) $(VPPDBG) -endif $(LIBSAIREDIS)_RDEPENDS += $(LIBSWSSCOMMON) $(LIBSAIREDIS)_DEB_BUILD_OPTIONS = nocheck SONIC_DPKG_DEBS += $(LIBSAIREDIS) @@ -20,9 +16,6 @@ LIBSAIREDIS_DEV = $(LIBSAIREDIS_NAME)-dev_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_AR $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIREDIS_DEV))) LIBSAIVS = libsaivs_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb -ifeq ($(CONFIGURED_PLATFORM),vpp) -$(LIBSAIVS)_RDEPENDS += $(VPP_MAIN) $(VPP_PLUGIN_CORE) $(VPP_PLUGIN_DPDK) -endif $(eval $(call add_derived_package,$(LIBSAIREDIS),$(LIBSAIVS))) LIBSAIVS_DEV = libsaivs-dev_$(LIBSAIREDIS_VERSION)_$(CONFIGURED_ARCH).deb diff --git a/rules/vpp.dep b/rules/vpp.dep deleted file mode 100644 index 480240ea350..00000000000 --- a/rules/vpp.dep +++ /dev/null @@ -1,8 +0,0 @@ -SPATH := $($(VPPINFRA)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/vpp.mk rules/vpp.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files)) - -$(VPPINFRA)_CACHE_MODE := GIT_CONTENT_SHA -$(VPPINFRA)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(VPPINFRA)_DEP_FILES := $(DEP_FILES) diff --git a/rules/vpp.mk b/rules/vpp.mk deleted file mode 100644 index 0c9e61e7bd1..00000000000 --- a/rules/vpp.mk +++ /dev/null @@ -1,54 +0,0 @@ -# libvpp package - -VPP_VERSION_BASE = 2510 -VPP_VERSION = $(VPP_VERSION_BASE)-0.1 -VPP_VERSION_SONIC = $(VPP_VERSION)+b1sonic1 -VPP_SRC_PATH = platform/vpp/vppbld - -export VPP_VERSION_SONIC -export VPP_SRC_PATH - -VPPINFRA = libvppinfra_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(VPPINFRA)_SRC_PATH = $(VPP_SRC_PATH) -$(VPPINFRA)_DEPENDS += $(LIBNL3) $(LIBNL3_DEV) $(LIBNL_ROUTE3) $(LIBNL_ROUTE3_DEV) -SONIC_MAKE_DEBS += $(VPPINFRA) - -VPP_MAIN = vpp_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(VPP_MAIN)_DEPENDS += $(VPPINFRA) -$(VPP_MAIN)_RDEPENDS += $(VPPINFRA) -$(eval $(call add_derived_package,$(VPPINFRA),$(VPP_MAIN))) - -LIBNUMA := $(shell apt-get download --print-uris libnuma1 | cut -d " " -f2) -$(LIBNUMA)_URL := $(shell apt-get download --print-uris libnuma1 | cut -d " " -f1) -SONIC_ONLINE_DEBS += $(LIBNUMA) - -VPP_PLUGIN_CORE = vpp-plugin-core_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(VPP_PLUGIN_CORE)_DEPENDS += $(VPP_MAIN) -$(VPP_PLUGIN_CORE)_RDEPENDS += $(VPP_MAIN) -$(eval $(call add_derived_package,$(VPPINFRA),$(VPP_PLUGIN_CORE))) - -VPP_PLUGIN_DPDK = vpp-plugin-dpdk_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(VPPINFRA),$(VPP_PLUGIN_DPDK))) -$(VPP_PLUGIN_DPDK)_DEPENDS += $(LIBNUMA) $(VPP_MAIN) -$(VPP_PLUGIN_DPDK)_RDEPENDS += $(LIBNUMA) $(VPP_MAIN) - -VPPINFRA_DEV = libvppinfra-dev_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(VPPINFRA_DEV)_DEPENDS += $(VPPINFRA) -$(eval $(call add_derived_package,$(VPPINFRA),$(VPPINFRA_DEV))) - -VPP_PLUGIN_DEV = vpp-plugin-devtools_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(VPP_PLUGIN_DEV)_DEPENDS += $(VPP_MAIN) $(VPPINFRA) -$(VPP_PLUGIN_DEV)_RDEPENDS += $(VPP_MAIN) $(VPPINFRA) -$(eval $(call add_derived_package,$(VPPINFRA),$(VPP_PLUGIN_DEV))) - -VPP_DEV = vpp-dev_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(VPP_DEV)_DEPENDS += $(VPPINFRA_DEV) -$(VPP_DEV)_RDEPENDS += $(VPPINFRA_DEV) -$(eval $(call add_derived_package,$(VPPINFRA),$(VPP_DEV))) - -VPPDBG = vpp-dbg_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(VPPINFRA),$(VPPDBG))) - -VPP_VERSION_FILE = vpp_$(VPP_VERSION_SONIC)_commit - -export VPP_MAIN VPPINFRA VPP_PLUGIN_CORE VPP_PLUGIN_DPDK VPP_PLUGIN_DEV VPP_DEV VPPINFRA_DEV VPPDBG VPP_VERSION_FILE diff --git a/slave.mk b/slave.mk index c1175f09891..e47c8d8377c 100644 --- a/slave.mk +++ b/slave.mk @@ -319,6 +319,19 @@ ifeq ($(SONIC_PROFILING_ON),y) DEB_BUILD_OPTIONS_GENERIC := nostrip noopt endif +# ccache configuration — prepend /usr/lib/ccache to PATH so that gcc/g++/cc/c++ +# calls are intercepted by ccache symlinks. Cache is stored under target/ccache/ +# and persists across builds for near-instant recompilation of unchanged files. +CCACHE_ENV = +ifeq ($(SONIC_CONFIG_USE_CCACHE),y) +ifeq ($(shell command -v ccache >/dev/null 2>&1 || echo notfound),notfound) +$(error SONIC_CONFIG_USE_CCACHE=y but 'ccache' is not installed in the build environment) +endif +CCACHE_DIR := $(abspath $(TARGET_PATH)/ccache/$(BLDENV)) +CCACHE_ENV = PATH=/usr/lib/ccache:$$PATH CCACHE_DIR=$(CCACHE_DIR) CCACHE_BASEDIR=$(BUILD_WORKDIR) CCACHE_COMPILERCHECK=content CCACHE_UMASK=022 +$(shell mkdir -p $(CCACHE_DIR)) +endif + ifeq ($(SONIC_BUILD_JOBS),) override SONIC_BUILD_JOBS := $(SONIC_CONFIG_BUILD_JOBS) endif @@ -431,6 +444,7 @@ $(info "SONIC_BUILD_JOBS" : "$(SONIC_BUILD_JOBS)") $(info "SONIC_CONFIG_MAKE_JOBS" : "$(SONIC_CONFIG_MAKE_JOBS)") $(info "USE_NATIVE_DOCKERD_FOR_BUILD" : "$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD)") $(info "USE_DOCKER_CACHE" : "$(SONIC_CONFIG_USE_DOCKER_CACHE)") +$(info "SONIC_CONFIG_USE_CCACHE" : "$(SONIC_CONFIG_USE_CCACHE)") $(info "USERNAME" : "$(USERNAME)") $(info "PASSWORD" : "$(PASSWORD)") $(info "CHANGE_DEFAULT_PASSWORD" : "$(CHANGE_DEFAULT_PASSWORD)") @@ -815,7 +829,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_MAKE_DEBS)) : $(DEBS_PATH)/% : .platform $$(a if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && ( quilt pop -a -f 1>/dev/null 2>&1 || true ) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi $(LOG) # Build project and take package $(SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR) - DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC}" $(ANT_DEB_CONFIG) $(CROSS_COMPILE_FLAGS) make -j$(SONIC_CONFIG_MAKE_JOBS) DEST=$(shell pwd)/$(DEBS_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(DEBS_PATH)/$* $(LOG) + $(CCACHE_ENV) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC}" $(ANT_DEB_CONFIG) $(CROSS_COMPILE_FLAGS) make -j$(SONIC_CONFIG_MAKE_JOBS) DEST=$(shell pwd)/$(DEBS_PATH) -C $($*_SRC_PATH) $(shell pwd)/$(DEBS_PATH)/$* $(LOG) # Clean up if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; [ -d .pc ] && rm -rf .pc; popd; fi $(LOG) @@ -861,8 +875,8 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a if [ -f ./autogen.sh ]; then ./autogen.sh $(LOG); fi $(SETUP_OVERLAYFS_FOR_DPKG_ADMINDIR) $(if $($*_DPKG_TARGET), - ${$*_BUILD_ENV} DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" DEB_BUILD_PROFILES="${$*_DEB_BUILD_PROFILES}" $(ANT_DEB_CONFIG) $(CROSS_COMPILE_FLAGS) timeout --preserve-status -s 9 -k 10 $(BUILD_PROCESS_TIMEOUT) dpkg-buildpackage -rfakeroot -b $(ANT_DEB_CROSS_OPT) -us -uc -tc -j$(SONIC_CONFIG_MAKE_JOBS) --as-root -T$($*_DPKG_TARGET) --admindir $$mergedir $(LOG), - ${$*_BUILD_ENV} DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" DEB_BUILD_PROFILES="${$*_DEB_BUILD_PROFILES}" $(ANT_DEB_CONFIG) $(CROSS_COMPILE_FLAGS) timeout --preserve-status -s 9 -k 10 $(BUILD_PROCESS_TIMEOUT) dpkg-buildpackage -rfakeroot -b $(ANT_DEB_CROSS_OPT) -us -uc -tc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $$mergedir $(LOG) + ${$*_BUILD_ENV} $(CCACHE_ENV) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" DEB_BUILD_PROFILES="${$*_DEB_BUILD_PROFILES}" $(ANT_DEB_CONFIG) $(CROSS_COMPILE_FLAGS) timeout --preserve-status -s 9 -k 10 $(BUILD_PROCESS_TIMEOUT) dpkg-buildpackage -rfakeroot -b $(ANT_DEB_CROSS_OPT) -us -uc -tc -j$(SONIC_CONFIG_MAKE_JOBS) --as-root -T$($*_DPKG_TARGET) --admindir $$mergedir $(LOG), + ${$*_BUILD_ENV} $(CCACHE_ENV) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS_GENERIC} ${$*_DEB_BUILD_OPTIONS}" DEB_BUILD_PROFILES="${$*_DEB_BUILD_PROFILES}" $(ANT_DEB_CONFIG) $(CROSS_COMPILE_FLAGS) timeout --preserve-status -s 9 -k 10 $(BUILD_PROCESS_TIMEOUT) dpkg-buildpackage -rfakeroot -b $(ANT_DEB_CROSS_OPT) -us -uc -tc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $$mergedir $(LOG) ) popd $(LOG_SIMPLE) # Clean up @@ -1867,15 +1881,20 @@ jessie : $$(addprefix $(TARGET_PATH)/,$$(JESSIE_DOCKER_IMAGES)) \ ############################################################################### ############################################################################### -## Build report — post-build timing and dependency analysis +## ccache targets ############################################################################### +ccache-stats : +ifeq ($(SONIC_CONFIG_USE_CCACHE),y) + CCACHE_DIR=$(CCACHE_DIR) ccache -s +else + @echo "ccache is not enabled. Set SONIC_CONFIG_USE_CCACHE=y in rules/config.user" +endif + +ccache-clear : + rm -rf $(TARGET_PATH)/ccache + @echo "ccache cleared" -build-report: - @echo "=== Generating build timing report ===" - @bash $(PROJECT_ROOT)/scripts/build-timing-report.sh $(TARGET_PATH) - @echo "" - @echo "=== Generating dependency graph analysis ===" - @python3 $(PROJECT_ROOT)/scripts/build-dep-graph.py $(PROJECT_ROOT) +.PHONY : ccache-stats ccache-clear .PHONY : $(SONIC_CLEAN_DEBS) $(SONIC_CLEAN_FILES) $(SONIC_CLEAN_PHONIES) $(SONIC_CLEAN_TARGETS) $(SONIC_CLEAN_STDEB_DEBS) $(SONIC_CLEAN_WHEELS) $(SONIC_PHONY_TARGETS) clean distclean configure build-report diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2 index 9d6ebe792b1..0c0f809089f 100644 --- a/sonic-slave-bookworm/Dockerfile.j2 +++ b/sonic-slave-bookworm/Dockerfile.j2 @@ -99,6 +99,7 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install pigz \ git \ build-essential \ + ccache \ remake \ libtool \ lintian \ diff --git a/sonic-slave-trixie/Dockerfile.j2 b/sonic-slave-trixie/Dockerfile.j2 index 95499638d9d..8cfdf8e24a2 100644 --- a/sonic-slave-trixie/Dockerfile.j2 +++ b/sonic-slave-trixie/Dockerfile.j2 @@ -98,6 +98,7 @@ RUN apt-get update && apt-get install -y eatmydata && eatmydata apt-get install pigz \ git \ build-essential \ + ccache \ remake \ libtool \ lintian \ diff --git a/src/sonic-bmp b/src/sonic-bmp index c4eeaebc92a..9625f504df6 160000 --- a/src/sonic-bmp +++ b/src/sonic-bmp @@ -1 +1 @@ -Subproject commit c4eeaebc92a9afe8251b0c61782f0b259fb08f23 +Subproject commit 9625f504df65ff8fa1ca0528e957532a51e91a4a diff --git a/src/sonic-config-engine/tests/sample_output/py2/lldp_conf/lldpd-ipv6-iface.conf b/src/sonic-config-engine/tests/sample_output/py2/lldp_conf/lldpd-ipv6-iface.conf index f5727556fdf..ccec8bfb484 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/lldp_conf/lldpd-ipv6-iface.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/lldp_conf/lldpd-ipv6-iface.conf @@ -1,2 +1,4 @@ +configure ports eth0 lldp portidsubtype local eth0 +configure system ip management pattern 2603:10e2:0:2902::8 configure system hostname switch-t0 pause diff --git a/src/sonic-config-engine/tests/sample_output/py3/lldp_conf/lldpd-ipv6-iface.conf b/src/sonic-config-engine/tests/sample_output/py3/lldp_conf/lldpd-ipv6-iface.conf index f5727556fdf..ccec8bfb484 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/lldp_conf/lldpd-ipv6-iface.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/lldp_conf/lldpd-ipv6-iface.conf @@ -1,2 +1,4 @@ +configure ports eth0 lldp portidsubtype local eth0 +configure system ip management pattern 2603:10e2:0:2902::8 configure system hostname switch-t0 pause diff --git a/src/sonic-gnmi b/src/sonic-gnmi index 49468856c75..5b8142273c8 160000 --- a/src/sonic-gnmi +++ b/src/sonic-gnmi @@ -1 +1 @@ -Subproject commit 49468856c753f13dd6395ac690ccba851088accf +Subproject commit 5b8142273c83b950cb328ea1b518fc5890ee516d diff --git a/src/sonic-mgmt-common b/src/sonic-mgmt-common index b420c656213..61d8b07bc00 160000 --- a/src/sonic-mgmt-common +++ b/src/sonic-mgmt-common @@ -1 +1 @@ -Subproject commit b420c656213ffe7f7faff6efb93279f91484278a +Subproject commit 61d8b07bc003f5f42abadea499b03c50682ae35d diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 6ab20ec2f73..b85fff321bb 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 6ab20ec2f73e229b2470f551e57a1d445ebf3dbb +Subproject commit b85fff321bb605dafe2670981ecc1846aa016beb diff --git a/src/sonic-sairedis b/src/sonic-sairedis index ca4fe78acd4..45c2a9a5cf9 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit ca4fe78acd493680569383ac3aa0dafbec4b964a +Subproject commit 45c2a9a5cf9c80eec7200d0edddf4f3611fcd277 diff --git a/src/sonic-swss b/src/sonic-swss index 4b8f649428b..18752666b9b 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 4b8f649428b99ee5487073a924502f9a89698a36 +Subproject commit 18752666b9bf902a72515b92c516ae5210bd78b1 diff --git a/src/sonic-utilities b/src/sonic-utilities index 20a7131b6c2..0f536f1375a 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 20a7131b6c284f758a3866f8a74c915cec147c74 +Subproject commit 0f536f1375a61daa018055dfba416a0d4cab9abe diff --git a/src/system-health/health_checker/sysmonitor.py b/src/system-health/health_checker/sysmonitor.py index 57518e80f24..2828564611f 100755 --- a/src/system-health/health_checker/sysmonitor.py +++ b/src/system-health/health_checker/sysmonitor.py @@ -330,7 +330,7 @@ def get_unit_status(self, event): #Raise syslog for service state change logger.log_info("{} service state changed to [{}/{}]".format(event, active_state, sub_state)) - if status == "enabled" or status == "enabled-runtime" or status == "static": + if status in ("enabled", "enabled-runtime", "static", "generated"): if fail_reason == "success": fail_reason = "-" if (active_state == "active" and sub_state == "exited"): diff --git a/src/system-health/tests/test_system_health.py b/src/system-health/tests/test_system_health.py index d6bbee18532..83673755c85 100644 --- a/src/system-health/tests/test_system_health.py +++ b/src/system-health/tests/test_system_health.py @@ -962,7 +962,9 @@ def test_get_app_ready_status(mock_config_db, mock_run, mock_docker_client): mock_srv_props={ 'mock_radv.service':{'Type': 'simple', 'Result': 'success', 'Id': 'mock_radv.service', 'LoadState': 'loaded', 'ActiveState': 'active', 'SubState': 'running', 'UnitFileState': 'enabled'}, -'mock_bgp.service':{'Type': 'simple', 'Result': 'success', 'Id': 'mock_bgp.service', 'LoadState': 'loaded', 'ActiveState': 'inactive', 'SubState': 'dead', 'UnitFileState': 'enabled'} +'mock_bgp.service':{'Type': 'simple', 'Result': 'success', 'Id': 'mock_bgp.service', 'LoadState': 'loaded', 'ActiveState': 'inactive', 'SubState': 'dead', 'UnitFileState': 'enabled'}, +'mock_swss_generated.service':{'Type': 'simple', 'Result': 'success', 'Id': 'mock_swss_generated.service', 'LoadState': 'loaded', 'ActiveState': 'active', 'SubState': 'running', 'UnitFileState': 'generated'}, +'mock_syncd_generated.service':{'Type': 'simple', 'Result': 'success', 'Id': 'mock_syncd_generated.service', 'LoadState': 'loaded', 'ActiveState': 'inactive', 'SubState': 'dead', 'UnitFileState': 'generated'} } @patch('health_checker.sysmonitor.Sysmonitor.get_all_service_list', MagicMock(return_value=['mock_snmp.service', 'mock_bgp.service', 'mock_ns.service'])) @@ -1031,6 +1033,28 @@ def test_get_unit_status_not_ok(): assert result == 'NOT OK' +@patch('health_checker.sysmonitor.Sysmonitor.run_systemctl_show', MagicMock(return_value=mock_srv_props['mock_swss_generated.service'])) +@patch('health_checker.sysmonitor.Sysmonitor.get_app_ready_status', MagicMock(return_value=('Up','-','-'))) +@patch('health_checker.sysmonitor.Sysmonitor.post_unit_status', MagicMock()) +def test_get_unit_status_generated_running_ok(): + """Test that active/running services with UnitFileState=generated are reported as OK.""" + sysmon = Sysmonitor() + result = sysmon.get_unit_status('mock_swss_generated.service') + print("get_unit_status for generated running service:{}".format(result)) + assert result == 'OK' + + +@patch('health_checker.sysmonitor.Sysmonitor.run_systemctl_show', MagicMock(return_value=mock_srv_props['mock_syncd_generated.service'])) +@patch('health_checker.sysmonitor.Sysmonitor.get_app_ready_status', MagicMock(return_value=('Up','-','-'))) +@patch('health_checker.sysmonitor.Sysmonitor.post_unit_status', MagicMock()) +def test_get_unit_status_generated_inactive_not_ok(): + """Test that inactive services with UnitFileState=generated are reported as NOT OK.""" + sysmon = Sysmonitor() + result = sysmon.get_unit_status('mock_syncd_generated.service') + print("get_unit_status for generated inactive service:{}".format(result)) + assert result == 'NOT OK' + + @patch('health_checker.sysmonitor.Sysmonitor.get_all_service_list', MagicMock(return_value=['mock_snmp.service', 'mock_ns.service'])) @patch('health_checker.sysmonitor.Sysmonitor.get_unit_status', MagicMock(return_value= 'OK')) @patch('health_checker.sysmonitor.Sysmonitor.publish_system_status', MagicMock())