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

Make sure building with relative paths work correctly. #13210

Merged
merged 1 commit into from
Feb 11, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Feb 11, 2022

Fixes: #12763

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 11, 2022
cfDir := filepath.Dir(c)
if absDir, err := filepath.EvalSymlinks(cfDir); err == nil {
name := filepath.ToSlash(strings.TrimPrefix(c, cfDir+string(filepath.Separator)))
c = filepath.Join(absDir, name)
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: extra line

@flouthoc
Copy link
Collaborator

@Luap99 Some of the unrelated netavark tests are failing, could it be that we have regressed netavark upstream ?

@vrothberg
Copy link
Member

@Luap99 Some of the unrelated netavark tests are failing, could it be that we have regressed netavark upstream ?

Are we merging netavark PRs without exercising them here?

@flouthoc
Copy link
Collaborator

@vrothberg Afaik I think yes but i am not sure if changes are immediately reflected on podman's CI. @cevich @Luap99 Could tell this better.

@vrothberg
Copy link
Member

@vrothberg Afaik I think yes but i am not sure if changes are immediately reflected on podman's CI. @cevich @Luap99 Could tell this better.

If that's the case, Podman CI should probably pick specific commits from netavark (instead of branch which I presume is what we're doing). Just as we do with all other dependencies and building blocks.

@Luap99
Copy link
Member

Luap99 commented Feb 11, 2022

Yes we use the main branch currently, The plan is to switch to the packaged netavark once we have a release.
I do not understand why we get timeouts now, the only netavark PR that was merged is this one: https://github.com/containers/netavark/pull/218/files and I do not think this causes a hang.
We also made some aardvark changes but I do not see why this would cause a hang since aardvark runs in the background.

@Luap99
Copy link
Member

Luap99 commented Feb 11, 2022

My netavark PR did cause the issue, I accidentally swapped the logic there.
containers/netavark#220 will fix it, once merged you need to wait ~15min and then you can restart the tests. A force push is not required.

@jwhonce
Copy link
Member

jwhonce commented Feb 11, 2022

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 11, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2022
@openshift-merge-robot openshift-merge-robot merged commit 564404b into containers:main Feb 11, 2022
@cevich
Copy link
Member

cevich commented Feb 11, 2022

Are we merging netavark PRs without exercising them here?

Afaik I think yes but i am not sure if changes are immediately reflected on podman's CI. @cevich @Luap99 Could tell this better.

FYI (since this is already merged), yes this is the case. It's likely a signal of a testing gap in netavark CI. We could (in theory) run some select podman e2e tests under netavark CI, but it's not a small amount of work to get that going.

@vrothberg
Copy link
Member

FYI (since this is already merged), yes this is the case. It's likely a signal of a testing gap in netavark CI. We could (in theory) run some select podman e2e tests under netavark CI, but it's not a small amount of work to get that going.

We're doing something similar in Skopeo and c/image. c/image always uses a branch of Skopeo (because those are the actual tests) but Skopeo uses a commit of c/image to make vendoring explicit and from another repo breaking CI.

@cevich
Copy link
Member

cevich commented Feb 14, 2022

This is also possible to do. I believe all that's needed is to find the CI run for the specific commit you want, and simply update the download URLs in .cirrus.yml accordingly. Unf. I don't believe there's a simple/easy path to find the artifact URL by lookup on commit ID, but I could be wrong.

If someone wants to spend time on it, there is a path from commit ID -> artifact URL that goes through the Cirrus GraphQL API. So a small script could (in theory) do this...with the caveat that not all Commit IDs have associated CI runs, so the script would need to handle that appropriately.

root -> [searchBuilds]()(
    repositoryOwner: [String]!
    repositoryName: [String]!
    SHA: [String]
): [[Build]]

@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 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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
Development

Successfully merging this pull request may close these issues.

Duplicated subdirectory on podman build on OSX
7 participants