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]: Cherry pick PRs from master to 202106 branch #10590

Merged
merged 4 commits into from
Apr 18, 2022

Conversation

xumia
Copy link
Collaborator

@xumia xumia commented Apr 16, 2022

Co-authored-by: Ubuntu xumia@xumia-vm1.jqzc3g5pdlluxln0vevsg3s20h.xx.internal.cloudapp.net

Why I did it

Cherry-pick PR (#9426, #9443, #10325, #10525) from master to 202106 branch to fix marvell-armhf build broken issue.

How I did it

How to verify it

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)

xumia and others added 3 commits April 16, 2022 01:35
sonic-net#9443)

Fix the nodesource.list cannot read issue, it is cased by the full path not used.

```
2021-12-03T06:59:26.0019306Z Removing intermediate container 77cfe980cd36
2021-12-03T06:59:26.0020872Z  ---> 528fd40e60f6
2021-12-03T06:59:26.0021457Z Step 81/81 : RUN post_run_buildinfo
2021-12-03T06:59:26.0841136Z  ---> Running in d804bd7e1b06
2021-12-03T06:59:29.1626594Z �[91mDEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained. pip 21.0 will drop support for Python 2.7 in January 2021. More details about Python 2 support in pip can be found at https://pip.pypa.io/en/latest/development/release-process/#python-2-support pip 21.0 will remove support for this functionality.
2021-12-03T06:59:34.2960105Z �[0m�[91m/usr/bin/sed: can't read nodesource.list: No such file or directory
2021-12-03T06:59:34.5094880Z �[0mThe command '/bin/sh -c post_run_buildinfo' returned a non-zero code: 2
```

Co-authored-by: Ubuntu <xumia@xumia-vm1.jqzc3g5pdlluxln0vevsg3s20h.xx.internal.cloudapp.net>
Why I did it
[Build]: Fix pip version constraint conflict issue
When a version is specified in the constraint file, if upgrading the version in build script, it will have conflict issue.

How I did it
If a specified version has specified in pip command line, then the version constraint will be skipped.
…o sort them (sonic-net#10325)

For Bullseye, Python 2 isn't present at all. This means that in certain
build cases (such as building something only for Bullseye), the version
file may not exist, and so the sort command would fail.

For most normal build commands, this probably won't be an issue, because
the SONiC build will start with Buster (which has both Python 2 and
Python 3 wheels built), and so the py2 and py3 files will be present
even during the Bullseye builds.

Signed-off-by: Saikrishna Arcot <[email protected]>
@xumia xumia force-pushed the fix-sourcelist-issue-202106 branch from ae274e8 to 61ea2c2 Compare April 16, 2022 01:39
@xumia xumia changed the title [Bug][Build]: fix the file not found issue caused by the relative pat… [Build]: Cherry pick PRs from master to 202106 branch Apr 16, 2022
)

[Build]: Support reproducible build for release branches sonic-net#9426
@xumia
Copy link
Collaborator Author

xumia commented Apr 16, 2022

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@qiluo-msft
Copy link
Collaborator

qiluo-msft commented Apr 17, 2022

You picked #9426 but not mentioned in the PR description.
Are they clean cherry-pick? If yes, we can 'rebase and merge' to keep a better git history.

@xumia
Copy link
Collaborator Author

xumia commented Apr 17, 2022

You picked #9426 but not mentioned in the PR description. Are they clean cherry-pick? If yes, we can 'rebase and merge' to keep a better git history.

Yes, missing #9426 in the description, added #9426, there are 4 commits.

@xumia xumia merged commit 331bc53 into sonic-net:202106 Apr 18, 2022
@xumia xumia deleted the fix-sourcelist-issue-202106 branch April 18, 2022 00:19
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.

3 participants