Backport #18577 to v4.4.1-rhel#19632
Backport #18577 to v4.4.1-rhel#19632openshift-merge-robot merged 2 commits intocontainers:v4.4.1-rhelfrom
Conversation
Fixes: containers#18239 [NO NEW TESTS NEEDED] @test "podman build -f test" in test/system/070-build.bats Will test this. This was passing when run on a local system since the remote end was using the clients path to read the Containerfile The issue is it would not work in a podman machine since the Containerfile would/should be a different path. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> <MH: Cherry-pick to v4.4.1-rhel> Signed-off-by: Matt Heon <mheon@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mheon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
LGTM but tests are unhappy |
|
Seems infra-related, same issue on all python tests. |
|
@mheon I think you're hitting the same/similar issues I fixed in:
Hopefully the same/similar fix will work here: Restrict Curiously, none of our branch-CI monitors seem to have detected this problem 🤔 (cc: @edsantiago & @lsm5). Or they're simple a day behind reality. |
|
Update: Yep, branch-ci ran cleanly 😕 |
Apparent Cython regression causing a warning and traceback when installing PyYAML with pip: Ref. Upstream issue 601: https://github.com/yaml/pyyaml/issues/ Ref. warning message: ``` ******************************************************************************** The license_file parameter is deprecated, use license_files instead. By 2023-Oct-30, you need to update your project and remove deprecated calls or your builds will no longer be supported. See https://setuptools.pypa.io/en/latest/userguide/declarative_config.html for details. ******************************************************************************** ``` Ref. traceback snippet: ``` Traceback (most recent call last): File "/var/tmp/go/src/github.com/containers/podman/venv/lib/python3.10/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py", line 353, in <module> main() ...cut... File "<string>", line 201, in get_source_files File "/tmp/pip-build-env-yiijk0jv/overlay/lib/python3.10/site-packages/setuptools/_distutils/cmd.py", line 107, in __getattr__ raise AttributeError(attr) AttributeError: cython_sources ``` Signed-off-by: Chris Evich <cevich@redhat.com> <MH: Cherry-pick back to v4.4.1-rhel> Signed-off-by: Matt Heon <mheon@redhat.com>
|
Fix commit for CI cherry-picked in |
|
Rerunning one flake, otherwise seems good to merge. |
| m = []string{query.Dockerfile} | ||
| } | ||
| for _, containerfile := range m { | ||
| containerFiles = append(containerFiles, filepath.Join(contextDirectory, filepath.Clean(filepath.FromSlash(containerfile)))) |
There was a problem hiding this comment.
is the contextDirectory assured to be safe at this point? i.e., no way for a symbolic link to get sluffed in?
There was a problem hiding this comment.
We made it ourselves via extracting a tar file so it should be safe.
| setuptools~=50.3.2 | ||
| python-dateutil~=2.8.1 | ||
| PyYAML~=5.4.1 | ||
| PyYAML==6.0.1 |
There was a problem hiding this comment.
Is this correct? We have 6.0.0 upstream, I think they should match, even if it means bumping upstream
There was a problem hiding this comment.
This is straight from @cevich and is necessary to fix CI on the branch
There was a problem hiding this comment.
Not something we ship so it should be fine.
|
/lgtm |
Backport per RHBZ 2229749
Replaces #19416
Does this PR introduce a user-facing change?