add upgrade case to test clusterlogforwarder #1935
Conversation
openshift-ci-robot
added
lgtm
|
New logs: @anpingli , sorry, I updated this PR, could you please review it again? Thanks. |
| # check pvc count | ||
| unless BushSlicer::PersistentVolumeClaim.list(user: user, project: project).count == cluster_logging('instance').logstore_node_count | ||
| raise "The PVC count doesn't match the ES node count" | ||
| if cluster_logging('instance').log_store_spec != nil |
There was a problem hiding this comment.
What will happen when patch result in subscription.operators.coreos.com/cluster-logging unchanged?
There was a problem hiding this comment.
If the patch command fails, then the scenario will be failed. https://github.com/openshift/verification-tests/pull/1935/files#diff-25b7b9fb37c470ca782e7381a157ec7648e98a1a80f61f2cce948bba99bf676cR649 .
The upgrade only happens when the channel or/and catalog source changed, if there is no change, then the step I upgrade the operator with won't be executed: https://github.com/openshift/verification-tests/pull/1935/files#diff-25b7b9fb37c470ca782e7381a157ec7648e98a1a80f61f2cce948bba99bf676cR724.
I didn't process the condition when the catalog source changed, I'll modify it.
There was a problem hiding this comment.
The steps in upgrade-check scenario are:
- check if logging could work as expected after cluster is upgraded
- check if logging should to be upgraded, if yes, upgrade logging and ensure EFK pods can be upgraded
- check if logging could work as expected
There are some duplication in step 1 and step 3 if step 2 is not executed, but I think this condition won't happen frequently.
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
|
Logs: /hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
|
@anpingli could you please help to review this PR again? |
|
/assign @pruan-rht @liangxia |
| @@ -124,19 +124,19 @@ def wait_until_kibana_is_ready(user: nil, quiet: false, timeout: 10*60) | |||
| end | |||
| end | |||
|
|
|||
| private def collection_spec(user: nil, quiet: false, cached: false) | |||
| def collection_spec(user: nil, quiet: false, cached: false) | |||
There was a problem hiding this comment.
@QiaolingTang any reason you changed these methods from private?
There was a problem hiding this comment.
@pruan-rht In clusterlogging, the collection_spec, log_store_spec, curation_spec and visualization_spec are optional. In some scenarios we may not define all of them when creating clusterlogging/instance. I want to use these methods to check if these specs are defined or not. An example: https://github.com/openshift/verification-tests/pull/1935/files#diff-25b7b9fb37c470ca782e7381a157ec7648e98a1a80f61f2cce948bba99bf676cR667
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: anpingli, pruan-rht, QiaolingTang 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 |
openshift-ci-robot
added
the
approved
case: https://url.corp.redhat.com/f0086ba
upgrade-prepare: https://url.corp.redhat.com/b72f05c
upgrade-check: https://url.corp.redhat.com/5b5458d
/cc @anpingli @gkarager