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.

Sign up for GitHub

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

Jump to bottom

build: relay exitcode from imagebuildah to registry #12622

Merged
merged 2 commits into from
Dec 17, 2021
Merged

build: relay exitcode from imagebuildah to registry #12622

merged 2 commits into from
Dec 17, 2021

Conversation

flouthoc
Copy link
Collaborator

Podman does not relay exit code from buildah instead returns a generic
error code 125. Following PR allows podman to relay exit code from
imagebuildah to registry as it is.

Closes: #12616

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 16, 2021
@flouthoc
Copy link
Collaborator Author

Lets see if other tests are happy with this.

giuseppe
giuseppe approved these changes Dec 16, 2021
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, giuseppe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vrothberg
vrothberg reviewed Dec 16, 2021
View reviewed changes
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 16, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2021
@flouthoc
Copy link
Collaborator Author

Lets see if other tests are happy with this.

As expected I have to adjust older tests to receive actual error code instead of 125 :\

Luap99
Luap99 reviewed Dec 16, 2021
View reviewed changes
cmd/podman/images/build.go Outdated
Comment on lines 297 to 303
if w, ok := ee.Sys().(syscall.WaitStatus); ok {
exitCode = w.ExitStatus()
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need for this, you can directly call ee.ExitCode()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Luap99 Fixed in latest commit however I think go versions older than 1.12 does not contains ExitCode() but I think we are not going to be using 1.12 so we should be good.

@flouthoc flouthoc force-pushed the return_exit_code_for_build branch from 941e97f to cf13541 Compare December 17, 2021 09:11
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2021
@flouthoc
build: relay exitcode from imagebuildah to registry
f566d8b 
Podman does not relay exit code from buildah instead returns a generic
error code `125`. Following PR allows `podman` to relay exit code from
`imagebuildah` to `registry` as it is.

Signed-off-by: Aditya Rajan <[email protected]>
@flouthoc flouthoc force-pushed the return_exit_code_for_build branch from cf13541 to 99619ca Compare December 17, 2021 09:38
@rhatdan
Copy link
Member

rhatdan commented Dec 17, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2021
@flouthoc
tests: adjust old build test to expect exit code
6423174 
Old build tests were expecting genric error code `125` however another
commit in this PR ensures that we relay exact exit code from build to
registry.

Hence adjusting tests

Signed-off-by: Aditya Rajan <[email protected]>
@flouthoc flouthoc force-pushed the return_exit_code_for_build branch from 99619ca to 6423174 Compare December 17, 2021 10:51
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2021
@rhatdan
Copy link
Member

rhatdan commented Dec 17, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2021
@flouthoc
Copy link
Collaborator Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2021
@openshift-merge-robot openshift-merge-robot merged commit 820cf0e into containers:main Dec 17, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Luap99 Luap99 Luap99 left review comments

@vrothberg vrothberg vrothberg left review comments

@rhatdan rhatdan rhatdan left review comments

@giuseppe giuseppe giuseppe approved these changes

Assignees

@rhatdan rhatdan

@vrothberg vrothberg

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build exit code propagation
6 participants
@flouthoc @rhatdan @giuseppe @vrothberg @Luap99 @openshift-merge-robot