[release-4.15] exclude NOOBAA_PSQL_12_IMAGE for image verification after upgrade

[vavuthu]

cherry-pick of #10723

Signed-off-by: vavuthu [email protected]

[shylesh]

lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ebenahar, petr-balogh, shylesh, vavuthu

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

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

[clacroix12]

Verified: https://url.corp.redhat.com/40b094b

[petr-balogh]

/cherry-pick release-4.16

[openshift-cherrypick-robot]

@petr-balogh: #11446 failed to apply on top of branch "release-4.16":

Applying: exclude NOOBAA_PSQL_12_IMAGE for image verification after upgrade
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/constants.py
M	ocs_ci/ocs/ocp.py
M	ocs_ci/ocs/ocs_upgrade.py
M	ocs_ci/ocs/resources/pod.py
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
Auto-merging ocs_ci/ocs/resources/pod.py
Auto-merging ocs_ci/ocs/ocs_upgrade.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/ocs_upgrade.py
Auto-merging ocs_ci/ocs/ocp.py
Auto-merging ocs_ci/ocs/constants.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 exclude NOOBAA_PSQL_12_IMAGE for image verification after upgrade

In response to this:

/cherry-pick release-4.16

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.

[vavuthu]

/cherry-pick release-4.17

[openshift-cherrypick-robot]

@vavuthu: #11446 failed to apply on top of branch "release-4.17":

Applying: exclude NOOBAA_PSQL_12_IMAGE for image verification after upgrade
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/constants.py
M	ocs_ci/ocs/ocp.py
M	ocs_ci/ocs/ocs_upgrade.py
M	ocs_ci/ocs/resources/pod.py
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
Auto-merging ocs_ci/ocs/resources/pod.py
Auto-merging ocs_ci/ocs/ocs_upgrade.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/ocs_upgrade.py
Auto-merging ocs_ci/ocs/ocp.py
Auto-merging ocs_ci/ocs/constants.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 exclude NOOBAA_PSQL_12_IMAGE for image verification after upgrade

In response to this:

/cherry-pick release-4.17

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.