-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[team]: Add docker-team dependencies #136
Conversation
@@ -2,6 +2,6 @@ | |||
|
|||
DOCKER_TEAM = docker-team.gz | |||
$(DOCKER_TEAM)_PATH = $(DOCKERS_PATH)/docker-team | |||
$(DOCKER_TEAM)_DEPENDS += $(SWSS) | |||
$(DOCKER_TEAM)_DEPENDS += $(SWSS) $(LIBTEAM) $(LIBTEAMDCT) $(LIBTEAM_UTILS) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
swss already has a runtime dependency on team
https://github.com/Azure/sonic-buildimage/blob/master/rules/swss.mk#L7
This is redundant
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated to remove redundant dependencies
@@ -4,6 +4,5 @@ SWSS = swss_1.0.0_amd64.deb | |||
$(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss | |||
$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \ | |||
$(LIBTEAMDCT) $(LIBTEAM_UTILS) | |||
$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBTEAMDCT) \ | |||
$(LIBTEAM_UTILS) | |||
$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to clarify: so those two are only needed for for docker-team?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. teamd/teamdctl commands are only supposed to work in docker-team
) This should also fix the vsimage check build. Commits include: * src/sonic-platform-common a659219...e4883e5 (7): > [PsuBase] Reference inherited member constant (#142) > Thermalctld APIs for recording min and max temp (#131) > Common power consumption and supply APIs for modular chassis (#136) > [sonic-platform-base] Introduce APIs for modular chassis support (#124) > Remove shebangs from non-executable Python files (#140) > [sonic_eeprom] Make compatible with Python 2 and 3 (#127) > Add unit test infrastructure (#139) * src/sonic-platform-daemons 600d043...be21d91 (9): > [psud] Import of mock libraries determined by environment variable (#117) > [chassisd][thermalctld] Set testing env var at top of file, not in setup_function() (#114) > [chassisd][thermalctld] Import os module, now needed for env var checking (#113) > [chassisd][thermalctld] Import mock libraries based on environment variable (#112) > [xcvrd] Fix the console-script xcvrd startup (#111) > [Thermalctld] Update thermal info to CHASSIS_STATE_DB (#101) > PSUd changes to compute power-budget for Modular chassis (#104) > Introduce chassisd to monitor status of cards on chassis (#97) > [xcvrd] support for integrating Credo Y cable Ports initialization and status updates with xcvrd. (#105)
…nic-net#5924) This should also fix the vsimage check build. Commits include: * src/sonic-platform-common a659219...e4883e5 (7): > [PsuBase] Reference inherited member constant (sonic-net#142) > Thermalctld APIs for recording min and max temp (sonic-net#131) > Common power consumption and supply APIs for modular chassis (sonic-net#136) > [sonic-platform-base] Introduce APIs for modular chassis support (sonic-net#124) > Remove shebangs from non-executable Python files (sonic-net#140) > [sonic_eeprom] Make compatible with Python 2 and 3 (sonic-net#127) > Add unit test infrastructure (sonic-net#139) * src/sonic-platform-daemons 600d043...be21d91 (9): > [psud] Import of mock libraries determined by environment variable (sonic-net#117) > [chassisd][thermalctld] Set testing env var at top of file, not in setup_function() (sonic-net#114) > [chassisd][thermalctld] Import os module, now needed for env var checking (sonic-net#113) > [chassisd][thermalctld] Import mock libraries based on environment variable (sonic-net#112) > [xcvrd] Fix the console-script xcvrd startup (sonic-net#111) > [Thermalctld] Update thermal info to CHASSIS_STATE_DB (sonic-net#101) > PSUd changes to compute power-budget for Modular chassis (sonic-net#104) > Introduce chassisd to monitor status of cards on chassis (sonic-net#97) > [xcvrd] support for integrating Credo Y cable Ports initialization and status updates with xcvrd. (sonic-net#105)
…et#136) sonic-platform-base: Changes to introduce APIs for modular chassis for power-consumption and supplied HLD: sonic-net/SONiC#646 PSUd APIs for power requirement calculations get_maximum_supplied_power() - per PSU get_status_master_led() - get master psu led status. Class method. set_status_master_led() - set master psu led status. Class method. get_maximum_consumed_power(self) - per consumer API. Consumers are modules, Fans
Addressing review comments
…bmodule head linkmgrd: * 44f182b 2022-10-03 | [Active-Standby] fix syslog flood caused by `unkown -> standby` switchovers (sonic-net#137) (HEAD -> 202205) [Jing Zhang] * 9284ce1 2022-09-26 | [Active-Active] avoid being stuck in `unknown` after process init (sonic-net#136) [Jing Zhang] * 55711d7 2022-09-16 | Install libyang to azure pipeline (sonic-net#132) [Hua Liu] swss: * 2f7da1e 2022-09-30 | [build] add missing package libyang-dev in lgtm.yml (sonic-net#2475) (HEAD -> 202205, github/202205) [Qi Luo] platform-daemon: * 5b96170 2022-09-23 | add support to execute new ycable API's, add datetime field to mux_info (sonic-net#297) (HEAD -> 202205) [vdahiya12] platform-common: * de1bd8e 2022-09-28 | Remove shell=True (sonic-net#313) (HEAD -> 202205) [Mai Bui] * 77760bf 2022-09-23 | [credo][ycable] remove mux-toggle inprogress flags for some API's (sonic-net#311) [vdahiya12] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
…bmodule head (#12264) linkmgrd: * 44f182b 2022-10-03 | [Active-Standby] fix syslog flood caused by `unkown -> standby` switchovers (#137) (HEAD -> 202205) [Jing Zhang] * 9284ce1 2022-09-26 | [Active-Active] avoid being stuck in `unknown` after process init (#136) [Jing Zhang] * 55711d7 2022-09-16 | Install libyang to azure pipeline (#132) [Hua Liu] swss: * 2f7da1e 2022-09-30 | [build] add missing package libyang-dev in lgtm.yml (#2475) (HEAD -> 202205, github/202205) [Qi Luo] platform-daemon: * 5b96170 2022-09-23 | add support to execute new ycable API's, add datetime field to mux_info (#297) (HEAD -> 202205) [vdahiya12] platform-common: * de1bd8e 2022-09-28 | Remove shell=True (#313) (HEAD -> 202205) [Mai Bui] * 77760bf 2022-09-23 | [credo][ycable] remove mux-toggle inprogress flags for some API's (#311) [vdahiya12] Signed-off-by: Ying Xie <ying.xie@microsoft.com> Signed-off-by: Ying Xie <ying.xie@microsoft.com>
79edf66 Longxiang Lyu Wed Aug 17 08:12:37 2022 +0800 Fix azure pipeline (#118) 8e0f2c6 Longxiang Lyu Wed Aug 17 08:36:07 2022 +0800 Update linkmgr health after getting default route update (#117) b14ffb8 Jing Zhang Wed Aug 17 15:44:37 2022 -0700 [active-active] post mux metrics events (#123) a30dbb3 Jing Zhang Thu Aug 18 18:16:04 2022 -0700 Update handleMuxConfigNotification logic (#125) e14aaba Jing Zhang Tue Aug 23 10:02:17 2022 -0700 [active-active] Remove unnecessary mux wait timeout logs (#122) cc83717 Longxiang Lyu Fri Sep 2 02:17:53 2022 +0800 Fix mux config (#128) 5429281 Mai Bui Thu Sep 1 17:44:04 2022 -0400 [linkmgrd] Replace memset function in link_prober (#126) b5aaec1 Jing Zhang Fri Sep 9 14:01:03 2022 -0700 [active-active] shutdown link prober when starting as isolated (#130) 75f02cf Jing Zhang Tue Sep 13 10:34:32 2022 -0700 [active-standby] update warmboot reconciliation logic (#129) a5a9f90 Hua Liu Fri Sep 16 09:54:32 2022 +0800 Install libyang to azure pipeline (#132) 6fe4f0f Jing Zhang Tue Sep 20 10:10:16 2022 -0700 [Active-Active] flaky LinkmgrdBootupSequence unit tests (#134) ea68e8c Jing Zhang Wed Sep 21 10:52:18 2022 -0700 Post switchover reasons to STATE DB (#131) 60c35b5 Jing Zhang Thu Sep 22 13:00:41 2022 -0700 [Active-Active] server side admin forwarding state sync up (#133) 08e1be5 Jing Zhang Mon Sep 26 10:59:27 2022 -0700 [Active-Active] avoid being stuck in unknown after process init (#136) 2579988 Jing Zhang Mon Oct 3 09:40:55 2022 -0700 [Active-Standby] fix syslog flood caused by unkown -> standby switchovers (#137) 7e9f670 Jing Zhang Wed Oct 5 10:03:45 2022 -0700 [Active-Active] Retry config mux mode standby (#139) 23feb3b Jing Zhang Wed Oct 5 15:22:58 2022 -0700 [Active-Active] Post link prober stats to state db (#140) e650098 Jing Zhang Fri Oct 7 15:27:17 2022 -0700 [Active-Active] Update default route shutdown heartbeat logic (#141) d0653e7 Jing Zhang Tue Oct 11 10:22:02 2022 -0700 [Active-Standby] avoid posting mux metrics event when receiving unsolicited mux state notification (#142) dcf6460 Longxiang Lyu Fri Oct 21 12:15:42 2022 +0800 [active-active] Add support to send/handle mux probe request (#147) fdf42ed Longxiang Lyu Fri Oct 21 10:34:47 2022 +0800 Fix link prober state event report twice issue (#149) 5fd19a3 Longxiang Lyu Mon Oct 17 09:20:27 2022 +0800 [active-active] Fix config reload (#145) sign-off: Jing Zhang zhangjing@microsoft.com
Why I did it Improve dbus interface timeout. How I did it I have updated sonic-gnmi, and update submodule in this PR. How to verify it Run gnmi_set for incremental config update.
…matically (#14749) src/sonic-py-swsssdk * a79fa67 - (HEAD -> 202205, origin/202205) [Security] Fix the redis security issue CVE-2023-28858 and CVE-2023-28859 (#136) (11 hours ago) [xumia]
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
…utomatically (#19568) #### Why I did it src/sonic-host-services ``` * cfb3cb8 - (HEAD -> master, origin/master, origin/HEAD) Modified scripts: replaced deprecated 'logger' with 'syslogger' (#136) (2 hours ago) [Ashwin Srinivasan] ``` #### How I did it #### How to verify it #### Description for the changelog
…utomatically (sonic-net#19568) #### Why I did it src/sonic-host-services ``` * cfb3cb8 - (HEAD -> master, origin/master, origin/HEAD) Modified scripts: replaced deprecated 'logger' with 'syslogger' (sonic-net#136) (2 hours ago) [Ashwin Srinivasan] ``` #### How I did it #### How to verify it #### Description for the changelog
…utomatically (#20014) #### Why I did it src/sonic-host-services ``` * 40dda80 - (HEAD -> 202405, origin/202405) Fix modify_single_file generate empty file issue (#145) (3 hours ago) [Hua Liu] * 0782d4c - Modified scripts: replaced deprecated 'logger' with 'syslogger' (#136) (3 hours ago) [Ashwin Srinivasan] ``` #### How I did it #### How to verify it #### Description for the changelog
No description provided.