Merge sonic-swss master into 201803#1791
Merged
lguohan merged 1 commit intosonic-net:201803from Jun 15, 2018
Merged
Conversation
…c-swss-common, and sonic-utilities
lguohan
approved these changes
Jun 13, 2018
tiantianlv
pushed a commit
to tiantianlv/sonic-buildimage
that referenced
this pull request
Jul 30, 2018
…is, sonic-swss-common, and sonic-utilities (sonic-net#1791)" This reverts commit 4d795ec.
5 tasks
vivekrnv
added a commit
to vivekrnv/sonic-buildimage
that referenced
this pull request
Sep 15, 2021
Signed-off-by: Vivek Reddy Karri <[email protected]> ce11545 [config reload] Removed job-mode for sonic.target restart (sonic-net#1820) f76f672 [fdbshow]: Fix typo in comment (sonic-net#1809) 17208a0 [ci]: Support PR coverage (sonic-net#1806) c2c2354 fix wrong code indent in sfputil (sonic-net#1808) 47a9a0f [portconfig] Validate duplicate speed value and interface type value (sonic-net#1745) f1086ee [sonic_installer]Add --skip-platform-check option for sonic_installer when image mismatch (sonic-net#1791) c007d65 [warm-reboot] Add new preboot health check: verify database integrity (sonic-net#1785) 41e31e8 Fix PatchApplier init order (sonic-net#1762)
qiluo-msft
pushed a commit
that referenced
this pull request
Sep 28, 2021
0d538d3 [ci]: Support code diff coverage (#1834) 48887d1 [config] support for configuring muxcable to standby mode of operation (#1837) 2088a9a Provide support to install platform extensions (#1578) c97fe54 Add check_db_integrity script to setup.py (#1828) c0b9917 [debug dump util] COPP Module Added (#1670) 826311c [techsupport] Removed interactive option for docker commands and Improved Error Reporting (#1723) ce11545 [config reload] Removed job-mode for sonic.target restart (#1820) f76f672 [fdbshow]: Fix typo in comment (#1809) 17208a0 [ci]: Support PR coverage (#1806) c2c2354 fix wrong code indent in sfputil (#1808) 47a9a0f [portconfig] Validate duplicate speed value and interface type value (#1745) f1086ee [sonic_installer]Add --skip-platform-check option for sonic_installer when image mismatch (#1791) c007d65 [warm-reboot] Add new preboot health check: verify database integrity (#1785) 41e31e8 Fix PatchApplier init order (#1762) 2416175 [config reload] Fix config reload failure due to sonic.target job cancellation (#1814) 2b12aad [portstat, intfstat] added rates and utilization (#1750) 26e700a [debug dump util] Techsupport addition (#1669) 9f2326e [debug dump util] Base Skeleton and Click Class added (#1668)
theasianpianist
pushed a commit
to theasianpianist/sonic-buildimage
that referenced
this pull request
Feb 5, 2022
taras-keryk
pushed a commit
to taras-keryk/sonic-buildimage
that referenced
this pull request
Apr 28, 2022
… when image mismatch (sonic-net#1791) What I did Add --skip-platform-check option for sonic_installer; How I did it Add --skip-platform-check option for sonic_installer when image ASIC mismatch; Split verify_binary_image to verify_secureboot_image and verify_image_platform to handle image verification more accurately. How to verify it Installing a bin file which differs the running platform's ASIC will fail. Previous command output (if the output of a command-line utility has changed) sudo sonic-installer install --help Usage: sonic-installer install [OPTIONS] URL Install image from local binary or URL Options: -y, --yes -f, --force_install Force installation of an image of a type which differs from that of the current running image --skip_migration Do not migrate current configuration to the newly installed image --skip-package-migration Do not migrate current packages to the newly installed image --help Show this message and exit. New command output (if the output of a command-line utility has changed) Options: -y, --yes -f, --force, --skip-secure-check Force installation of an image of a non- secure type than secure running image --skip-platform-check Force installation of an image of a type which is not of the same platform --skip_migration Do not migrate current configuration to the newly installed image --skip-package-migration Do not migrate current packages to the newly installed image --help Show this message and exit.
noaOrMlnx
pushed a commit
to noaOrMlnx/sonic-buildimage
that referenced
this pull request
Nov 24, 2025
…erP512 and QuicksilverP (sonic-net#1791) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Mitigate for the recent issue that under some unknown initial conditions, the 7060X6-64PE-B device could get into reboot loop. It's been identified so far that the reboot loop is related to the some bad switch chip state. While still trying to figure out the initial trigger, we propose this mitigation that break the reboot loop. The same mitigation to 7060X6-64PE is also included in this change. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it In boot0 script, if the environment is Aboot and the platform is 7060X6-64PE-B, reset the switch chip. #### How to verify it According to our test, this doesn't affect normal booting. <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- What I did
Update 201803 branch with masters of sonic-swss, sonic-sairedis, sonic-swss-common, and sonic-utilities
- How I did it
- How to verify it
Build an image and install to DUT
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)