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

Improve the PR build version #7381

Merged
merged 1 commit into from
Apr 23, 2021
Merged

Conversation

xumia
Copy link
Collaborator

@xumia xumia commented Apr 20, 2021

Why I did it

Improve the version of the Pull Request build by changing the local branch name.

How I did it

Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it

For official build, the version is not changed.
For pull request build, the version as below:

<target branch name>-<pullrequest id>.<azure pipelines build id>-<merge commit id>
Example: master-7381.11668-43df5c87

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

  • 201811
  • 201911
  • 202006
  • 202012

Description for the changelog

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

@xumia xumia requested a review from lguohan as a code owner April 20, 2021 04:52
@xumia xumia added the ci label Apr 20, 2021
@xumia xumia marked this pull request as draft April 20, 2021 04:53
@xumia xumia force-pushed the fix_pr_release_version branch from 283cc8b to cfeae77 Compare April 20, 2021 05:27
@xumia xumia requested a review from qiluo-msft April 20, 2021 05:28
@xumia xumia marked this pull request as ready for review April 20, 2021 05:29
@lguohan
Copy link
Collaborator

lguohan commented Apr 21, 2021

i download the image and tested, does not look like the version is correct.

admin@vlab-01:~$ show version

SONiC Software Version: SONiC.HEAD.0-7bb0dd81
Distribution: Debian 10.9
Kernel: 4.19.0-12-2-amd64
Build commit: 7bb0dd81
Build date: Tue Apr 20 06:42:13 UTC 2021
Built by: AzDevOps@sonic-build-workers-000786

Platform: x86_64-kvm_x86_64-r0
HwSKU: Force10-S6000
ASIC: vs
ASIC Count: 1

@lguohan
Copy link
Collaborator

lguohan commented Apr 21, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@xumia
Copy link
Collaborator Author

xumia commented Apr 22, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@xumia
Copy link
Collaborator Author

xumia commented Apr 22, 2021

i download the image and tested, does not look like the version is correct.

admin@vlab-01:~$ show version

SONiC Software Version: SONiC.HEAD.0-7bb0dd81
Distribution: Debian 10.9
Kernel: 4.19.0-12-2-amd64
Build commit: 7bb0dd81
Build date: Tue Apr 20 06:42:13 UTC 2021
Built by: AzDevOps@sonic-build-workers-000786

Platform: x86_64-kvm_x86_64-r0
HwSKU: Force10-S6000
ASIC: vs
ASIC Count: 1

@lguohan , it is depended on the PR #7320, the PR has merged. I re-run it, and test again.

1 similar comment
@xumia
Copy link
Collaborator Author

xumia commented Apr 22, 2021

i download the image and tested, does not look like the version is correct.

admin@vlab-01:~$ show version

SONiC Software Version: SONiC.HEAD.0-7bb0dd81
Distribution: Debian 10.9
Kernel: 4.19.0-12-2-amd64
Build commit: 7bb0dd81
Build date: Tue Apr 20 06:42:13 UTC 2021
Built by: AzDevOps@sonic-build-workers-000786

Platform: x86_64-kvm_x86_64-r0
HwSKU: Force10-S6000
ASIC: vs
ASIC Count: 1

@lguohan , it is depended on the PR #7320, the PR has merged. I re-run it, and test again.

@xumia
Copy link
Collaborator Author

xumia commented Apr 22, 2021

@lguohan , you have tested it after #7320 merged?

@xumia
Copy link
Collaborator Author

xumia commented Apr 22, 2021

https://dev.azure.com/mssonic/build/_build/results?buildId=11973&view=logs&j=d37bc48d-29a0-534f-a1dc-3d699deb17a6&t=77cf8939-28f3-5999-bfef-4ed2138e371e

"SONIC_IMAGE_VERSION" : "master-7381.0-9c380889"

@lguohan , the azure pipelines checks' build looks good now.

@lguohan
Copy link
Collaborator

lguohan commented Apr 22, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@lguohan
Copy link
Collaborator

lguohan commented Apr 22, 2021

the build id is not matching.

@xumia
Copy link
Collaborator Author

xumia commented Apr 22, 2021

the build id is not matching.

Yes, I did not export the build number env variable. The reason is that there were some opened PRs changing the same file. So I only change the branch name issue on this PR.
I can export it when PR #7399 merged

@xumia
Copy link
Collaborator Author

xumia commented Apr 23, 2021

I create a separate PR #7406, but it is ok to merge into this PR(only not sure any conflict).

@xumia xumia merged commit e8582ac into sonic-net:master Apr 23, 2021
@xumia xumia deleted the fix_pr_release_version branch April 23, 2021 02:24
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Apr 25, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Apr 25, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
lguohan pushed a commit that referenced this pull request Apr 25, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request May 10, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
liushilongbuaa pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request May 10, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
liushilongbuaa pushed a commit that referenced this pull request May 12, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
liushilongbuaa pushed a commit that referenced this pull request May 12, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
Why I did it
Improve the version of the Pull Request build by changing the local branch name.

How I did it
Change the default branch name merge to [target_branch_name]-[pullrequestid].

How to verify it
For official build, the version is not changed.
For pull request build, the version as below:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants