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

fix the format of output for OCP-13022 #3730

Merged
merged 6 commits into from
Jan 21, 2025

Conversation

lyman9966
Copy link
Contributor

in 4.17 and 4.18, the kubeletconfig format changed from json to yaml, this pr fix the issue.
Test passed in https://jenkins-csb-openshift-qe-mastern.dno.corp.redhat.com/job/ocp-common/job/Runner/1081067/console

@@ -77,6 +77,6 @@ Feature: Node components upgrade tests
| cat /etc/kubernetes/kubelet.conf |
Then the step should succeed
And the output should contain:
| "imageMinimumGCAge": "5m0s" |
Copy link
Member

Choose a reason for hiding this comment

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

Instead of hard code to json/yaml format, we can use the output should match, then we can regexp in the outputs.

@lyman9966
Copy link
Contributor Author

| "imageGCHighThresholdPercent": 80 |
| "maxPods": 240 |
And the output should match:
| [\"]?imageMinimumGCAge[\"]?: [\"]?5m0s[\"]? |
Copy link
Member

Choose a reason for hiding this comment

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

[\"]? can be shorten as "?

Copy link
Contributor Author

@lyman9966 lyman9966 Jan 17, 2025

Choose a reason for hiding this comment

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

I think ["]? is more accurate than ? , means only allow appearing " but no other character

Copy link
Member

Choose a reason for hiding this comment

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

I think I posted it as "?, not ?

@liangxia
Copy link
Member

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2025
@liangxia
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2025
Copy link

openshift-ci bot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liangxia

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

@lyman9966
Copy link
Contributor Author

Copy link

openshift-ci bot commented Jan 21, 2025

@lyman9966: all tests passed!

Full PR test history. Your PR dashboard.

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

@openshift-merge-bot openshift-merge-bot bot merged commit 363181e into openshift:master Jan 21, 2025
3 checks passed
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.

2 participants