-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
[release-1.31] ci: fix reload config for empty pinned image test #8632
[release-1.31] ci: fix reload config for empty pinned image test #8632
Conversation
wait_for_log looks at crio logs and waits for the given message to appear. If the message is already in the logs, it gets out immediately. To allow waiting for another occurence of the same message, we're making it output the timestamp of the first occurence that it finds. The caller can keep that information and provide it as a second parameter to wait_for_log, in which case wait_for_log will start waiting for the message after the given timestamp. Signed-off-by: Julien Ropé <jrope@redhat.com>
As the test is doing multiple reloads, it was hard to use wait_for_log to synchronize on the end of the reload process. With the modification on wait_for_log to allow waiting for multiple occurences of a log message, we can simplify this test, and make sure it's actually in sync. Keeping only one "wait_for_log" calls should be enough then - no need for multiple synchronization points, and the config validation is done by the calls to "crictl images". Fixes: cri-o#8324 Signed-off-by: Julien Ropé <jrope@redhat.com>
/approve |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, kwilczynski, openshift-cherrypick-robot 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 |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release-1.31 #8632 +/- ##
=============================================
Coverage 48.89% 48.89%
=============================================
Files 153 153
Lines 17371 17371
=============================================
Hits 8494 8494
Misses 7810 7810
Partials 1067 1067 |
92a56de
into
cri-o:release-1.31
This is an automated cherry-pick of #8399
/assign kwilczynski