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 rules/functions generate_manifest function #9340

Merged
merged 1 commit into from
Nov 23, 2021

Conversation

liushilongbuaa
Copy link
Contributor

@liushilongbuaa liushilongbuaa commented Nov 22, 2021

Why I did it

Fix a bug in sonic debug image build. That bug is imported in the following PR:
#8920

How I did it

How to verify it

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

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

@stepanblyschak
Copy link
Collaborator

@liushilongbuaa What is the issue?

@liushilongbuaa
Copy link
Contributor Author

liushilongbuaa commented Nov 22, 2021

@liushilongbuaa What is the issue?

@stepanblyschak Official debug sonic image build break.
generate_manifest uses 'j2 $($*.gz_PATH)/Dockerfile$(2).j2' command to generate Dockerfile.
If replace '-dbg' with 'dbg', j2 can't find correct Template file.

@stepanblyschak
Copy link
Collaborator

I think j2 $($*.gz_PATH)/Dockerfile$(2).j2 in generate_manifest was a copy paste mistake. The generate_manifest should not generate the Dockerfile. The Dockerfile is generated by slave.mk https://github.com/Azure/sonic-buildimage/blob/master/slave.mk#L814 and for debug dockers - https://github.com/Azure/sonic-buildimage/blob/master/slave.mk#L871. I suggest just to remove the line j2 $($*.gz_PATH)/Dockerfile$(2).j2.

@liushilongbuaa
Copy link
Contributor Author

liushilongbuaa commented Nov 22, 2021

@stepanblyschak I think you are right. I triggered a job to validate this PR. https://dev.azure.com/mssonic/build/_build/results?buildId=53359&view=results
build failed, but it is related to another issue #9305

@xumia
Copy link
Collaborator

xumia commented Nov 23, 2021

It is failed in publishing the artifacts step in the second attempt (error message: [error]Artifact sonic-buildimage.vs already exists for build 53358.), it will be fixed in another PR #9357, skip the merge validation checks and force merged it to break the loop.

@xumia xumia merged commit 7fc3470 into sonic-net:master Nov 23, 2021
liushilongbuaa added a commit that referenced this pull request Feb 7, 2022
Why I did it
Fix a bug in sonic debug image build. That bug is imported in the following PR: #8920
@liushilongbuaa liushilongbuaa deleted the shilongfixdebug branch October 18, 2022 07:01
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.

4 participants