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

[202305] Checkout correct branch from sonic-mgmt-common and sonic-swss-common during pipeline build #128

Merged
merged 2 commits into from
Jul 6, 2023

Conversation

sachinholla
Copy link
Contributor

@sachinholla sachinholla commented Jun 20, 2023

Why I did it

Pipeline is always fetching latest of sonic-mgmt-common and sonic-swss-common repos for its builds. They must be use source code from 202305 branch

How I did it

Checkout latest from $(System.PullRequest.TargetBranch) during PR builds and from $(Build.SourceBranchName) during manual builds.

Known issue: other pipeline artefacts are still being downloaded from master branch. Not a blocker as of now.

How to verify it

Pipeline build

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111

Description for the changelog

Link to config_db schema for YANG module changes

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

@sachinholla sachinholla force-pushed the 202305_pipeline branch 9 times, most recently from 6940d9e to d7d2b26 Compare June 21, 2023 09:55
@ganglyu
Copy link
Contributor

ganglyu commented Jul 3, 2023

@sachinholla do you have plan to fix pipeline for 202305?

@sachinholla
Copy link
Contributor Author

Yes @ganglyu, I want to have a permanent fix for this dependency. But I need 202305 branch in sonic-mgmt-common repo first. I had requested Yanzhao to create the branch earlier, but it is not ready yet. Will remind him again.

@ganglyu ganglyu requested a review from qiluo-msft July 4, 2023 01:41
@ganglyu
Copy link
Contributor

ganglyu commented Jul 4, 2023

@sachinholla please reply my email and provide your detailed requirement for us.

@sachinholla sachinholla changed the title [202305] Pipeline experiments -- do not merge [202305] Checkout correct branch from sonic-mgmt-common and sonic-swss-common during pipeline build Jul 4, 2023
ganglyu
ganglyu previously approved these changes Jul 4, 2023
@maipbui
Copy link
Contributor

maipbui commented Jul 4, 2023

@sachinholla Please merge latest master code to trigger Semgrep.

@sachinholla
Copy link
Contributor Author

@maipbui, master branch has many additional changes and cannot be merged to 202305. If the semgrep check requires any code change, isn't it best to disable it on the old branches?

@maipbui
Copy link
Contributor

maipbui commented Jul 5, 2023

@sachinholla maybe you can create a new PR. Semgrep is enforced on 07/03. Any PRs created before enforce timestamp 07/03 have hanging status check like in your PR. Our solution is usually to merge latest master code to trigger Semgrep. I think if you create new PR, which is after enforce timestamp, your new PR will not include Semgrep in status check. e.g. https://github.com/sonic-net/sonic-utilities/pull/2891/checks

@maipbui
Copy link
Contributor

maipbui commented Jul 5, 2023

Another better solution is to cherry-pick Semgrep PR to release branches, and you can merge latest 202305 branch to trigger Semgrep. I will request cherry-pick in release branches.

(cherry picked from commit fd78c42)
@sachinholla
Copy link
Contributor Author

@maipbui, I cherry picked fd78c42 and it seems working now

@qiluo-msft qiluo-msft merged commit 88ee65d into sonic-net:202305 Jul 6, 2023
4 checks passed
@sachinholla sachinholla deleted the 202305_pipeline branch August 16, 2023 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants