Skip to content
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

Fix sonic build with frr #2114

Merged
merged 2 commits into from
Oct 4, 2018
Merged

Fix sonic build with frr #2114

merged 2 commits into from
Oct 4, 2018

Conversation

nikos-github
Copy link
Collaborator

The sonic build is broken after the integration of frr 4.0 commit. This PR fixes the problem.

Regards,

Nikos.-

@lguohan lguohan merged commit d9d341b into sonic-net:master Oct 4, 2018
@nikos-github nikos-github deleted the frr-fix branch October 5, 2018 15:58
qiluo-msft pushed a commit that referenced this pull request Jan 19, 2022
includes:

320591a [DualToR] Handle race condition between tunnel_decap and mux orchestrator (#2114)
5027a8f Handling Invalid CRM configuration gracefully (#2109)
0b120fa [ci]: use native arm64 and armhf pool (#2013)
394e88a Don't handle buffer pool watermark during warm reboot reconciling (#1987)
9008a01 patch for issue #1971 - enable Rx Drop handling for cisco-8000 (#2041)
2723ee3 create debug_shell_enable config to enable debug shell (#2060)
d7be0b9 [request parser] Add unit tests for request parser for multiple values (#1766)
judyjoseph added a commit that referenced this pull request Apr 4, 2022
c5c105f (HEAD -> 202111, origin/202111) [PBH] Implement Edit Flows (#2093)
7050581 [techsupport] Handle minor fixes of TS Lock and update auto-TS (#2114)
3602f99 Fix issues in clear_qos (#2122)
4f96d3b Fixing get port speed when oper status is down (#2123)
liat-grozovik pushed a commit that referenced this pull request Apr 4, 2022
In order to include the following commit:
c752457 [PBH] Implement Edit Flows (sonic-net/sonic-utilities#2093)

sonic-utilities
f70dc27 [techsupport] Handle minor fixes of TS Lock and update auto-TS (#2114)
51d3550 Fix issues in clear_qos (#2122)
6d3aa1e [GCU] Optimizing moves by adding generators for keys/tables (#2120)
65a5a6b Fixing get port speed when oper status is down (#2123)
c752457 [PBH] Implement Edit Flows (#2093)
827358f [debug dump] dump interface module added (#2070)

Signed-off-by: Nazarii Hnydyn <[email protected]>
stepanblyschak added a commit to stepanblyschak/sonic-buildimage that referenced this pull request Apr 13, 2022
23e93984 [scripts/fast-reboot] Shutdown remaining containers through systemd (sonic-net#2133)
576c9efc [scripts/fast-reboot] stop timers in advance (sonic-net#2131)
4dad79c4 bugfix: incorrect command for portchannel creation (sonic-net#2134)
c17b1f49 [show][muxcable] Decrease the timeout for show mux status/hwmode (sonic-net#2130)
49d61f84 [scripts/fast-reboot] cleanup (sonic-net#2132)
52ca3245 [config/config_mgmt.py]: Fix dpb issue with upper case mac in (sonic-net#2066)
9e2fbf40 Update db_migrator to support `pfcwd_sw_enable` (sonic-net#2087)
4010bd09 FGNHG CLI changes (sonic-net#1588)
6bd54d04 Fix 'show mac' output when FDB entry for default vlan is None instead of 1 (sonic-net#2126)
f70dc27 [techsupport] Handle minor fixes of TS Lock and update auto-TS (sonic-net#2114)
51d3550 Fix issues in clear_qos (sonic-net#2122)
6d3aa1e [GCU] Optimizing moves by adding generators for keys/tables (sonic-net#2120)
65a5a6b Fixing get port speed when oper status is down (sonic-net#2123)
c752457 [PBH] Implement Edit Flows (sonic-net#2093)
827358f [debug dump] dump interface module added (sonic-net#2070)

Signed-off-by: Stepan Blyschak <[email protected]>
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Apr 28, 2022
…-net#2114)

1. Print the last statement as the techsupport dump name, as some automation processes might depend of parsing the last line to infer the dump path.

Previously:
  handle_exit
  Removing lock. Exit: 0
  removed '/tmp/techsupport-lock/PID'
  removed directory '/tmp/techsupport-lock'

Updated:
  handle_exit
  Removing lock. Exit: 0
  removed '/tmp/techsupport-lock/PID'
  removed directory '/tmp/techsupport-lock'
  /var/dump/sonic_dump_r-bulldog-03_20220324_195553.tar.gz

2. Don't acquire the lock when running in NOOP mode
3. Set the set -v option just before running main so that it won't print the generate_dump code to stdout
4. Update the auto-techsupport script to handle EXT_RETRY and EXT_LOCKFAIL exit codes returned by show techsupport command.
5. Update the minor error in since argument for auto-techsupport

Signed-off-by: Vivek Keddy Karri <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants