Revert "crio: drop infra container when possible"

[deads2k]

This reverts commit 6eb3789.

reverts #2177, one of two commits that merged before the permafail of e2e-serial on OOMs

[haircommander]

/hold

for openshift/release#13435 to merge so we can see if this revert fixes the serial tests

[deads2k]

/test ci/prow/e2e-aws-serial

[openshift-ci-robot]

@deads2k: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

• /test cluster-bootimages
• /test e2e-agnostic-upgrade
• /test e2e-aws
• /test e2e-aws-disruptive
• /test e2e-aws-proxy
• /test e2e-aws-workers-rhel7
• /test e2e-azure
• /test e2e-gcp-op
• /test e2e-metal-ipi
• /test e2e-openstack
• /test e2e-ovirt
• /test e2e-ovn-step-registry
• /test e2e-vsphere
• /test e2e-vsphere-upi
• /test images
• /test okd-e2e-aws
• /test okd-e2e-gcp-op
• /test okd-e2e-upgrade
• /test okd-images
• /test unit
• /test verify

Use /test all to run the following jobs:

• pull-ci-openshift-machine-config-operator-master-e2e-agnostic-upgrade
• pull-ci-openshift-machine-config-operator-master-e2e-aws
• pull-ci-openshift-machine-config-operator-master-e2e-aws-workers-rhel7
• pull-ci-openshift-machine-config-operator-master-e2e-gcp-op
• pull-ci-openshift-machine-config-operator-master-e2e-metal-ipi
• pull-ci-openshift-machine-config-operator-master-e2e-ovn-step-registry
• pull-ci-openshift-machine-config-operator-master-images
• pull-ci-openshift-machine-config-operator-master-okd-e2e-aws
• pull-ci-openshift-machine-config-operator-master-okd-images
• pull-ci-openshift-machine-config-operator-master-unit
• pull-ci-openshift-machine-config-operator-master-verify

Details

In response to this:

/test ci/prow/e2e-aws-serial

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[deads2k]

/retest

[deads2k]

/hold

for openshift/release#13435 to merge so we can see if this revert fixes the serial tests

It has merged. If this goes green on aws-serial, we should merge this and plan the next attempt.

[haircommander]

/lgtm
/approve

(I am not sure I have approval rights though...)

[yuqi-zhang]

This will be gated on e2e-aws-serial anyways so we'll find out if this was the PR that broke it

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, haircommander, yuqi-zhang

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [yuqi-zhang]

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

[rphillips]

/hold cancel

... so this can potentially merge tonight

[haircommander]

/hold

I will keep an eye on it, I still wanna see if e2e-aws-serial passes or fails before merging

[rphillips]

/retest

[haircommander]

this is the one

/hold cancel

[deads2k]

/retest