Fix tests for BVT testing

[coleenquadros]

The BVT tests are reporting failure because some of the managed clusters are never properly imported. However, Obs tests are also not correctly detecting and skipping these unhealthy clusters, and expecting Obs add-on to be present.

https://app.travis-ci.com/github/stolostron/canary/jobs/625626340

[philipgough]

/lgtm

[coleenquadros]

/retest

[subbarao-meduri]

/lgtm

[coleenquadros]

/retest

[coleenquadros]

/retest

[coleenquadros]

/retest

[coleenquadros]

/retest

[coleenquadros]

/retest

[coleenquadros]

/retest

[coleenquadros]

/test test-e2e

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

[subbarao-meduri]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coleenquadros, philipgough, subbarao-meduri

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:

• OWNERS [coleenquadros,philipgough,subbarao-meduri]

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

[coleenquadros]

/cherry-pick 2.11

[openshift-cherrypick-robot]

@coleenquadros: cannot checkout 2.11: error checking out "2.11": exit status 1 error: pathspec '2.11' did not match any file(s) known to git

In response to this:

/cherry-pick 2.11

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.

[coleenquadros]

/cherry-pick release-2.11

[coleenquadros]

/cherry-pick release-2.10

[openshift-cherrypick-robot]

@coleenquadros: new pull request created: #1600

In response to this:

/cherry-pick release-2.11

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.

[coleenquadros]

/cherry-pick release-2.9

[coleenquadros]

/cherry-pick release-2.8

[openshift-cherrypick-robot]

@coleenquadros: new pull request created: #1601

In response to this:

/cherry-pick release-2.10

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.

[openshift-cherrypick-robot]

@coleenquadros: new pull request created: #1602

In response to this:

/cherry-pick release-2.9

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.

[openshift-cherrypick-robot]

@coleenquadros: #1598 failed to apply on top of branch "release-2.8":

Applying: update tests to ignore clusters that dont have observability addon installed
Applying: update tests to ignore clusters that dont have observability addon installed
Applying: force add on obervability label for kind
Using index info to reconstruct a base tree...
M	cicd-scripts/setup-e2e-tests.sh
Falling back to patching base and 3-way merge...
Auto-merging cicd-scripts/setup-e2e-tests.sh
CONFLICT (content): Merge conflict in cicd-scripts/setup-e2e-tests.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 force add on obervability label for kind
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-2.8

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.