Skip to content

[Nokia][sonic-platform] Update sonic-platform submodule for Nokia-IXR7250E plaftorm#20367

Merged
lguohan merged 1 commit intosonic-net:masterfrom
mlok-nokia:update-sonic-platform-submodule
Oct 22, 2024
Merged

[Nokia][sonic-platform] Update sonic-platform submodule for Nokia-IXR7250E plaftorm#20367
lguohan merged 1 commit intosonic-net:masterfrom
mlok-nokia:update-sonic-platform-submodule

Conversation

@mlok-nokia
Copy link
Copy Markdown
Contributor

@mlok-nokia mlok-nokia commented Sep 27, 2024

Why I did it

Update sonic-platform submodule for Nokia-IXR7250E:
Fixes https://github.com/Nokia-ION/ndk/issues/57

  • cdfbbe2 [H4-32D]Update platform modules after OC tests (Update README.md #17)
  • f28eff0 [H4-64D]Fix SFP+ port, eeprom, reboot-cause, thermal algorithm, add PSU input voltage check (Fix rules in Makefiles #15)
  • 178e15a Minor watchdog change for better retention of last kick stamp
  • c479392 Remove rogue platform_reboot file
  • 331abe0 Enhance watchdog script to detect fsde device hung signature
  • 4c6b7c1 Fixed update temperature issue
  • 5002fb7 Remove average and maximum
  • c620130 No PSU Master status led in IMM. No need to set it
Work item tracking
  • Microsoft ADO (number only):

How I did it

Update sonic-platform submodule for Nokia-IXR7250E:

  • cdfbbe2 [H4-32D]Update platform modules after OC tests (Update README.md #17)
  • f28eff0 [H4-64D]Fix SFP+ port, eeprom, reboot-cause, thermal algorithm, add PSU input voltage check (Fix rules in Makefiles #15)
  • 178e15a Minor watchdog change for better retention of last kick stamp
  • c479392 Remove rogue platform_reboot file
  • 331abe0 Enhance watchdog script to detect fsde device hung signature
  • 4c6b7c1 Fixed update temperature issue
  • 5002fb7 Remove average and maximum
  • c620130 No PSU Master status led in IMM. No need to set it

How to verify it

check syslog, there should not be any error in PMON

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305
  • 202405

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@mlok-nokia mlok-nokia requested a review from lguohan as a code owner September 27, 2024 15:58
@mlok-nokia
Copy link
Copy Markdown
Contributor Author

@judyjoseph @arlakshm @Javier-Tan Please review this PR and cherry-pick to 202405.

arlakshm
arlakshm previously approved these changes Oct 4, 2024
@mlok-nokia
Copy link
Copy Markdown
Contributor Author

@arlakshm I just updated this PR with the latest submodule. Please help to review and approve it again. Thanks

@arlakshm
Copy link
Copy Markdown
Contributor

arlakshm commented Oct 4, 2024

/azpw ms_conflict

@arlakshm
Copy link
Copy Markdown
Contributor

arlakshm commented Oct 4, 2024

/Azp run ms_conflict

@azure-pipelines
Copy link
Copy Markdown

No pipelines are associated with this pull request.

arlakshm
arlakshm previously approved these changes Oct 4, 2024
@arlakshm
Copy link
Copy Markdown
Contributor

arlakshm commented Oct 4, 2024

/Azp ms_conflict

@azure-pipelines
Copy link
Copy Markdown

Command 'ms_conflict' is not supported by Azure Pipelines.

Supported commands
  • help:
    • Get descriptions, examples and documentation about supported commands
    • Example: help "command_name"
  • list:
    • List all pipelines for this repository using a comment.
    • Example: "list"
  • run:
    • Run all pipelines or specific pipelines for this repository using a comment. Use this command by itself to trigger all related pipelines, or specify specific pipelines to run.
    • Example: "run" or "run pipeline_name, pipeline_name, pipeline_name"
  • where:
    • Report back the Azure DevOps orgs that are related to this repository and org
    • Example: "where"

See additional documentation.

@Javier-Tan
Copy link
Copy Markdown

/azpw ms_conflict

@arlakshm
Copy link
Copy Markdown
Contributor

@mlok-nokia, can you resolve the merge conflict

@mlok-nokia
Copy link
Copy Markdown
Contributor Author

@mlok-nokia, can you resolve the merge conflict

@arlakshm I have rebased to resolve the conflict. Thanks.

@arlakshm
Copy link
Copy Markdown
Contributor

/Azp run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@lguohan lguohan merged commit aa79561 into sonic-net:master Oct 22, 2024
@mlok-nokia
Copy link
Copy Markdown
Contributor Author

The following cherry-pick PR to address the cherry-pick conflict issue
#20593

@bingwang-ms
Copy link
Copy Markdown
Contributor

Remove cherry-pick flag as PR#20593 is merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

6 participants