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

[release-1.31] ci: fix reload config for empty pinned image test #8632

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #8399

/assign kwilczynski

None

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>
@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Sep 30, 2024
@kwilczynski
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 30, 2024
@haircommander
Copy link
Member

/approve

Copy link
Contributor

openshift-ci bot commented Sep 30, 2024

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2024
Copy link

codecov bot commented Sep 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.89%. Comparing base (12d6e5e) to head (a673a7c).
Report is 3 commits behind head on release-1.31.

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           

@openshift-merge-bot openshift-merge-bot bot merged commit 92a56de into cri-o:release-1.31 Sep 30, 2024
57 of 59 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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants