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

[Build] Fix some of the patches not applied issue #15660

Merged
merged 4 commits into from
Jul 21, 2023

Conversation

xumia
Copy link
Collaborator

@xumia xumia commented Jun 29, 2023

Why I did it

Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
  • Microsoft ADO (number only): 24410730

How I did it

  1. Run the command to apply the patches without any conditions.
  2. If failed, check if the failure reason is "series fully applied".

How to verify it

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

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

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)

slave.mk Outdated Show resolved Hide resolved
@xumia
Copy link
Collaborator Author

xumia commented Jul 7, 2023

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

No commit pushedDate could be found for PR 15660 in repo sonic-net/sonic-buildimage

@xumia xumia force-pushed the fix-apply-patch-issue branch 2 times, most recently from 552597b to f542447 Compare July 8, 2023 00:15
@xumia xumia merged commit a0ba49d into sonic-net:master Jul 21, 2023
@xumia xumia deleted the fix-apply-patch-issue branch July 21, 2023 08:48
@liuh-80
Copy link
Contributor

liuh-80 commented Jul 27, 2023

@xumia , ADO branch tag missing, will approve 202012 branch after update ADO

mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Aug 6, 2023
Why I did it
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
Microsoft ADO (number only): 24410730
How I did it
Run the command to apply the patches without any conditions.
If failed, check if the failure reason is "series fully applied".
How to verify it
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #16048

mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Aug 6, 2023
Why I did it
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
Microsoft ADO (number only): 24410730
How I did it
Run the command to apply the patches without any conditions.
If failed, check if the failure reason is "series fully applied".
How to verify it
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202211: #16049

mssonicbld pushed a commit that referenced this pull request Aug 7, 2023
Why I did it
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
Microsoft ADO (number only): 24410730
How I did it
Run the command to apply the patches without any conditions.
If failed, check if the failure reason is "series fully applied".
How to verify it
@mssonicbld
Copy link
Collaborator

@xumia cherry pick PR didn't pass PR checker. Please check!!!
#16049

2 similar comments
@mssonicbld
Copy link
Collaborator

@xumia cherry pick PR didn't pass PR checker. Please check!!!
#16049

@mssonicbld
Copy link
Collaborator

@xumia cherry pick PR didn't pass PR checker. Please check!!!
#16049

@mssonicbld
Copy link
Collaborator

@xumia PR conflicts with 202205 branch

mssonicbld pushed a commit that referenced this pull request Aug 16, 2023
Why I did it
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
Microsoft ADO (number only): 24410730
How I did it
Run the command to apply the patches without any conditions.
If failed, check if the failure reason is "series fully applied".
How to verify it
@mssonicbld
Copy link
Collaborator

@xumia PR conflicts with 202012 branch

xumia added a commit to xumia/sonic-buildimage-1 that referenced this pull request Sep 6, 2023
Why I did it
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
Microsoft ADO (number only): 24410730
How I did it
Run the command to apply the patches without any conditions.
If failed, check if the failure reason is "series fully applied".
How to verify it
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
Why I did it
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

Work item tracking
Microsoft ADO (number only): 24410730
How I did it
Run the command to apply the patches without any conditions.
If failed, check if the failure reason is "series fully applied".
How to verify it
qiluo-msft pushed a commit that referenced this pull request Oct 9, 2023
### Why I did it

Cherry-pick  from #15660
Fix some of the patches in .patches folder not applied issue.
The command "quilt applied" only lists the applied patches, if some of the patches have issues, then the patches will not be applied when you run the build command again.

##### Work item tracking
- Microsoft ADO **(number only)**: 24410730

#### How I did it
1. Run the command to apply the patches without any conditions.
2. If failed, check if the failure reason is "series fully applied".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants