Skip to content

e2e: Use /proc/cmdline instead of rpm-ostree kargs#3034

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
cgwalters:config-drift-no-kargs
Mar 24, 2022
Merged

e2e: Use /proc/cmdline instead of rpm-ostree kargs#3034
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
cgwalters:config-drift-no-kargs

Conversation

@cgwalters
Copy link
Copy Markdown
Member

The main motivation here is to work around
coreos/rpm-ostree#3523
(Which is itself a workaround for a RHEL8 systemd bug)

Basically this e2e is invoking rpm-ostree kargs in a pretty
tight loop which triggers that bug.

To read the kernel command line, we can just read /proc/cmdline
instead. (Now, this is the actual cmdline instead of just rpm-ostree's
view of it, but it should be fine)

The main motivation here is to work around
coreos/rpm-ostree#3523
(Which is itself a workaround for a RHEL8 systemd bug)

Basically this e2e is invoking `rpm-ostree kargs` in a pretty
tight loop which triggers that bug.

To read the kernel command line, we can just read `/proc/cmdline`
instead.  (Now, this is the *actual* cmdline instead of just rpm-ostree's
view of it, but it should be fine)
@cgwalters
Copy link
Copy Markdown
Member Author

(not tested, but e2e will do that)

@cgwalters
Copy link
Copy Markdown
Member Author

getKernelArgs and assertKernelArgsEqual are called often from func (c configDriftTest) Run(t *testing.T) {

@openshift-ci openshift-ci Bot requested review from jkyros and sinnykumari March 22, 2022 14:43
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 22, 2022
@cgwalters
Copy link
Copy Markdown
Member Author

/test e2e-gcp-op

@cgwalters
Copy link
Copy Markdown
Member Author

/override ci/prow/e2e-aws
/override ci/prow/e2e-agnostic-upgrade
This is a change to our own e2e tests, it can't break cluster installs and testing it is a distracting waste of resources.

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

For ref we do exactly this in the actual kargs test:

kargs := helpers.ExecCmdOnNode(t, cs, infraNode, "cat", "/rootfs/proc/cmdline")

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 23, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, kikisdeliveryservice

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 [cgwalters,kikisdeliveryservice]

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

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 23, 2022
@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

/override ci/prow/e2e-aws
/override ci/prow/e2e-agnostic-upgrade

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 23, 2022

@kikisdeliveryservice: Overrode contexts on behalf of kikisdeliveryservice: ci/prow/e2e-agnostic-upgrade, ci/prow/e2e-aws

Details

In response to this:

/override ci/prow/e2e-aws
/override ci/prow/e2e-agnostic-upgrade

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 24, 2022

@cgwalters: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 0528d71 into openshift:master Mar 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants