Enable external registry support for OCP e2e tests in CI

[fjglira]

What type of PR is this?

• Enhancement / New Feature
• Bug Fix
• Refactor
• Optimization
• Test
• Documentation Update

What this PR does / why we need it:

Adding support to push to quay.io during any execution that runs over OCP cluster. This will simplify the build and push of the testing image because there is no need to enable the internal OCP registry anymore when running on CI. Now it handles 3 scenarios:

• Running locally against an OCP cluster and we want to use the internal OCP registry

make test.e2e.ocp

• Running on CI, and we want to push to quay.io to avoid this workaround of using the internal OCP registry:

CI=true PR_NUMBER=PR<number> make test.e2e.ocp

Note: if we don't want to set PR_NUMBER it will set the tag to TAG="ci-test-$(date +%s)"

• Running locally but the user want to push to another registry:

HUB=quay.io/frherrer make test.e2e.ocp

Which issue(s) this PR fixes:

Fixes #

Related Issue/PR #

Additional information:

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.64%. Comparing base (453ab1a) to head (648aada).
⚠️ Report is 71 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1514      +/-   ##
==========================================
+ Coverage   80.55%   80.64%   +0.08%     
==========================================
  Files          44       44              
  Lines        2299     2299              
==========================================
+ Hits         1852     1854       +2     
+ Misses        328      327       -1     
+ Partials      119      118       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[mkolesnik]

OK so after this change you must have Quay.io access to run the OCP E2E tests OR am I missing something?

Also if not setting CI=true then HUB is not set, but you removed the internal registry code, so where will local built images be pushed in this case?

[fjglira]

OK so after this change you must have Quay.io access to run the OCP E2E tests OR am I missing something?

Also if not setting CI=true then HUB is not set, but you removed the internal registry code, so where will local built images be pushed in this case?

Yes there are some gaps as I mentioned on slack in the qe channel. I’ll check those gaps tomorrow to fix them, but basically you need to have access to any registry. We all have access to quay so, each of us can create a organization and repository to build and push there, the sail-dev is scoped only for nightly build and testing images

[fjglira]

Hey @mkolesnik I updated the description of the PR and I simplified a lot the logic to handle all the testing cases

[FilipB]

localhost:5000 might be a bit confusing. HUB is set to default route here it would be good to unify the usage of HUB when pushing to internal registry.

[fjglira]

I added some improve to the logic, please take a look

[FilipB]

We should describe those scenarios in the Readme.

[fjglira]

I added some information

[istio-testing]

In response to a cherrypick label: #1514 failed to apply on top of branch "release-1.28":

Applying: Enable external registry support for OCP e2e tests in CI
Using index info to reconstruct a base tree...
M	tests/e2e/common-operator-integ-suite.sh
M	tests/e2e/setup/build-and-push-operator.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/setup/build-and-push-operator.sh
CONFLICT (content): Merge conflict in tests/e2e/setup/build-and-push-operator.sh
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
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 0001 Enable external registry support for OCP e2e tests in CI

[istio-testing]

In response to a cherrypick label: new issue created for failed cherrypick: #1646

[istio-testing]

In response to a cherrypick label: #1514 failed to apply on top of branch "release-1.0":

Applying: Enable external registry support for OCP e2e tests in CI
Using index info to reconstruct a base tree...
M	tests/e2e/common-operator-integ-suite.sh
A	tests/e2e/setup/build-and-push-operator.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/e2e/setup/build-and-push-operator.sh deleted in HEAD and modified in Enable external registry support for OCP e2e tests in CI. Version Enable external registry support for OCP e2e tests in CI of tests/e2e/setup/build-and-push-operator.sh left in tree.
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
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 0001 Enable external registry support for OCP e2e tests in CI

[istio-testing]

In response to a cherrypick label: new issue created for failed cherrypick: #1647

[istio-testing]

In response to a cherrypick label: #1514 failed to apply on top of branch "release-1.26":

Applying: Enable external registry support for OCP e2e tests in CI
Using index info to reconstruct a base tree...
M	tests/e2e/common-operator-integ-suite.sh
M	tests/e2e/setup/build-and-push-operator.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/setup/build-and-push-operator.sh
CONFLICT (content): Merge conflict in tests/e2e/setup/build-and-push-operator.sh
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
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 0001 Enable external registry support for OCP e2e tests in CI

[istio-testing]

In response to a cherrypick label: new issue created for failed cherrypick: #1648

[istio-testing]

In response to a cherrypick label: #1514 failed to apply on top of branch "release-1.27":

Applying: Enable external registry support for OCP e2e tests in CI
Using index info to reconstruct a base tree...
M	tests/e2e/common-operator-integ-suite.sh
M	tests/e2e/setup/build-and-push-operator.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/setup/build-and-push-operator.sh
CONFLICT (content): Merge conflict in tests/e2e/setup/build-and-push-operator.sh
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
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 0001 Enable external registry support for OCP e2e tests in CI

[istio-testing]

In response to a cherrypick label: new issue created for failed cherrypick: #1649