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

[V3.3] Update images #11163

Merged
merged 9 commits into from
Aug 19, 2021
Merged

Conversation

cevich
Copy link
Member

@cevich cevich commented Aug 9, 2021

Backport of #10829 for the v3.3 branch

Depends on: #11164, #11166

@mheon
Copy link
Member

mheon commented Aug 9, 2021

LGTM

@mheon
Copy link
Member

mheon commented Aug 9, 2021

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2021
test/e2e/run_device_test.go Outdated Show resolved Hide resolved
@cevich cevich changed the title [V3.3] update images [V3.3] [WIP] Update images Aug 9, 2021
@rhatdan
Copy link
Member

rhatdan commented Aug 9, 2021

/approve
/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 Aug 9, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cevich, mheon, 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

@cevich
Copy link
Member Author

cevich commented Aug 10, 2021

Note: I'm going to hold of updating this PR, since the test fixes are so similar to #10829

@cevich cevich force-pushed the v3.3_update_images branch from 9128c55 to bf23b48 Compare August 16, 2021 13:16
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2021
@cevich cevich force-pushed the v3.3_update_images branch 2 times, most recently from 346005b to 0b00a2f Compare August 17, 2021 14:00
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 17, 2021
@cevich cevich force-pushed the v3.3_update_images branch from 0b00a2f to af4db42 Compare August 17, 2021 15:39
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 17, 2021
cevich added 9 commits August 17, 2021 16:16
Previously we were generating the annotated results but never uploading
them.  Fix this so visiting the advertised URL actually works.

Signed-off-by: Chris Evich <[email protected]>
This test has been failing for a long time but nobody noticed because CI
doesn't have the device node (nested-VM support was disabled).  After
having enabled nested VM support, tests fail due to some unknown
special-handling of this device.

Fix both problems by removing the `skip()` and switching to a more generic
device which is only present when `--privileged` is used.

Signed-off-by: Chris Evich <[email protected]>
Update test to confirm the negative-case, proving the `--privileged`
"option is required" for this character device to be present in a
container (including rootless).

Signed-off-by: Chris Evich <[email protected]>
The `ls` command is not intended for this purpose and may behave in
unexpected ways, leading to false positive or negative results.  Update
the tests to use the purpose built `test` command instead.

Also added several *TODO* comments for possible future testing
enhancements.

Signed-off-by: Chris Evich <[email protected]>
This reverts commit 404d5ed.

The replacement (updated) images include a fix for:
containers/common#631

Also minor update to an unrelated FIXME comment.

Signed-off-by: Chris Evich <[email protected]>
This becomes a problem on hosts with upgraded policies.  Ref:
containers#10522

Also, made a small change to compose-test setup to reduce runtime.

Signed-off-by: Chris Evich <[email protected]>
These tests were originally enabled in a situation where CI provided
false-positive results.  Now that has been corrected, these tests all
fail under a CGv1 container environment with the error:

```
Error: unable to load cgroup at
/machine.slice/libpod-e4f...086.scope/libpod_parent/libpod-fbd...425:
cgroup deleted
```

This commit simply disables the tests under this specific environment.

Signed-off-by: Chris Evich <[email protected]>
@cevich cevich force-pushed the v3.3_update_images branch from 1d70e88 to a92441e Compare August 17, 2021 20:16
@cevich cevich changed the title [V3.3] [WIP] Update images [V3.3] Update images Aug 18, 2021
@cevich
Copy link
Member Author

cevich commented Aug 18, 2021

IMPORTANT: I'm okay if this PR merges before #10829 (to help with release timelines) however it makes me nervous. OTOH, the tests are passing, so 🤷‍♂️

@cevich cevich mentioned this pull request Aug 18, 2021
@TomSweeneyRedHat
Copy link
Member

LGTM
@mheon, PTAL and merge if it LGTY

@edsantiago
Copy link
Member

/lgtm
(will leave the hold for anyone else to cancel)

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2021
@rhatdan
Copy link
Member

rhatdan commented Aug 19, 2021

/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 Aug 19, 2021
@openshift-merge-robot openshift-merge-robot merged commit 55553bc into containers:v3.3 Aug 19, 2021
@cevich cevich deleted the v3.3_update_images branch April 18, 2023 14:45
@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 Aug 31, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 31, 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.

6 participants