Skip to content

[release-1.26] Enable external registry support for OCP e2e tests in CI #1541

@istio-testing

Description

@istio-testing

Manual cherrypick required.

#1514 failed to apply on top of branch "release-1.26":

Applying: Enable external registry support for OCP e2e tests in CI
Applying: Fix lint
Applying: Update tests/e2e/common-operator-integ-suite.sh
Applying: Add some improvements around the use of internal registry
.git/rebase-apply/patch:39: trailing whitespace.
# Uses default HUB=quay.io/sail-dev with auto-generated tags if no PR_NUMBER var is being set 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	tests/e2e/README.md
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
Auto-merging tests/e2e/README.md
CONFLICT (content): Merge conflict in tests/e2e/README.md
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 set advice.mergeConflict false"
Patch failed at 0004 Add some improvements around the use of internal registry

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions