Fix olm deploy env naming for curator operand image

[periklis]

Description

This PR addresses a naming conflict for overriding the curator image via env uring e2e tests from IMAGE_CURATOR5 to IMAGE_LOGGING_CURATOR5. Present upstream CI jobs use the IMAGE_LOGGING_CURATOR5 env name.

To address: https://issues.redhat.com/browse/LOG-1698

/cc @igor-karpukhin

[periklis]

/cherry-pick release-5.2

[openshift-cherrypick-robot]

@periklis: once the present PR merges, I will cherry-pick it on top of release-5.2 in a new PR and assign it to you.

In response to this:

/cherry-pick release-5.2

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/test-infra repository.

[igor-karpukhin]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: igor-karpukhin, periklis

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 [igor-karpukhin,periklis]

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

[openshift-cherrypick-robot]

@periklis: #792 failed to apply on top of branch "release-5.2":

Applying: Fix olm deploy env naming for curator operand image
Using index info to reconstruct a base tree...
M	olm_deploy/scripts/catalog-deploy.sh
A	olm_deploy/scripts/env.sh
M	olm_deploy/scripts/registry-init.sh
Falling back to patching base and 3-way merge...
Auto-merging olm_deploy/scripts/registry-init.sh
CONFLICT (modify/delete): olm_deploy/scripts/env.sh deleted in HEAD and modified in Fix olm deploy env naming for curator operand image. Version Fix olm deploy env naming for curator operand image of olm_deploy/scripts/env.sh left in tree.
Auto-merging olm_deploy/scripts/catalog-deploy.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix olm deploy env naming for curator operand image
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-5.2

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/test-infra repository.