Skip to content

OPRUN-3965: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests#403

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
camilamacedo86:ote-integration
Jul 16, 2025
Merged

OPRUN-3965: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests#403
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
camilamacedo86:ote-integration

Conversation

@camilamacedo86
Copy link
Contributor

@camilamacedo86 camilamacedo86 commented Jul 11, 2025

Due to current limitations, it appears we cannot maintain a dedicated Dockerfile solely for injecting the binary into OCP images while keeping it isolated and registered cleanly in openshift/origin.

This PR introduces the following changes:

  • Removes the Dockerfile used for testing purposes under the test-extension/ directory
  • Modifies the existing operator-controller.Dockerfile to directly add the required binary, ensuring it is included in the build process without relying on a separate image context.

These changes streamline the build pipeline while aligning with OCP image handling constraints.
The changes here is to allow us : openshift/origin#29949

Important
We could confirm that works

See that we run the test with this PR: https://github.com/openshift/origin/pull/29949/checks?check_run_id=45783243053

And looking the logs we can see the bin: https://prow.ci.openshift.org/log?container=test&id=1943585495564947456&job=multi-pr-openshift-origin-29949-openshift-origin-29949-openshift-operator-framework-operator-controller-403-e2e-aws

td33vcth/release@sha256:08990a8bdb91b81ab33f769cdf95f9064e50efe8ad54f4c531ba86893e3a7d17\" in 4.105449064s"
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:d766bc767b156efdb0e9ffc6e1c2ce726654171ddef3c8879dc00f40a0073698\" and src \"/usr/bin/k8s-tests-ext.gz\""
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:66d10a3bf99d8629c116d3477e47f24903fe3cb363660715a6bec12d9de36520\" and src \"/usr/bin/olmv1-tests-ext.gz\""
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:550d400881c3af8ee8664c213cc2c54398eede1f1c651bf7ff49abe7b6f82c53\" and src \"/machine-api-tests-ext.gz\""
time="2025-07-11T09:54:38Z" level=info msg="Completed image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:66d10a3bf99d8629c116d3477e47f24903fe3cb363660715a6bec12d9de36520\" in 4.840620234s"
time="2025-07-11T09:54:39Z" level=info msg="Extracted /usr/bin/olmv1-tests-ext.gz for tag olm-operator-con

Without this PR we see the error when the olmv1 ext bin is not found see:

4ymjgg19/stable@sha256:550d400881c3af8ee8664c213cc2c54398eede1f1c651bf7ff49abe7b6f82c53 (disk size 196843640, extraction duration 16.282630961s)"
error: couldn't retrieve test suites: failed to extract test binaries: encountered errors while extracting binaries: extracted binary at path "/tmp/home/.cache/openshift-tests/registry_build05_ci_openshift_org_ci-op-4ymjgg19_release_sha256_cff178b5c02fb845adbae958b60afa2f7a4e566ac3dd01160fe6c6a1f03cef6b_4892638eaf24/olmv1-tests-ext.gz" does not exist. the src path "/usr/bin/olmv1-tests-ext.gz" doesn't exist in image "registry.build05.ci.openshift.org/ci-op-4ymjgg19/stable@sha256:258241c69ae022719a65404f28a44fd22ea7b6817413341caf665c13b8084ee4". note the version of origin needs to match the version of the cluster under test

IN: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/29949/pull-ci-openshift-origin-main-e2e-aws/1942986031485685760

@camilamacedo86 camilamacedo86 changed the title UPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests OPRUN-3963: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests Jul 11, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 11, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 11, 2025

@camilamacedo86: This pull request references OPRUN-3963 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 11, 2025

@camilamacedo86: This pull request references OPRUN-3963 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Due to current limitations, it appears we cannot maintain a dedicated Dockerfile solely for injecting the binary into OCP images while keeping it isolated and registered cleanly in openshift/origin.

This PR introduces the following changes:

  • Removes the Dockerfile used for testing purposes under the test-extension/ directory
  • Modifies the existing operator-controller.Dockerfile to directly add the required binary, ensuring it is included in the build process without relying on a separate image context.

These changes streamline the build pipeline while aligning with OCP image handling constraints.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 11, 2025

@camilamacedo86: This pull request references OPRUN-3963 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Due to current limitations, it appears we cannot maintain a dedicated Dockerfile solely for injecting the binary into OCP images while keeping it isolated and registered cleanly in openshift/origin.

This PR introduces the following changes:

  • Removes the Dockerfile used for testing purposes under the test-extension/ directory
  • Modifies the existing operator-controller.Dockerfile to directly add the required binary, ensuring it is included in the build process without relying on a separate image context.

These changes streamline the build pipeline while aligning with OCP image handling constraints.
The changes here is to allow us : openshift/origin#29949

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 openshift-eng/jira-lifecycle-plugin repository.

@camilamacedo86
Copy link
Contributor Author

@kuiwang02

@kuiwang02
Copy link
Contributor

/lgtm

@camilamacedo86 after it is merged and new the ocp payload is delivered (I mean you could see the green build which has this PR in https://openshift-release.apps.ci.l2s4.p1.openshiftapps.com/#4.20.0-0.nightly), the openshift/origin#29949 will pass

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2025
@kuiwang02
Copy link
Contributor

for me, I am not sure if the command in openshift/origin#29949 (comment) is ok because the key point is that the ocp cluster must be installed with the ocp load which has the external binary.

but, after this PR is merged, the openshift/origin#29949 will pass after the new ocp load is generated.

so, could merge this PR firstly.

@kuiwang02
Copy link
Contributor

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2025
@camilamacedo86
Copy link
Contributor Author

Hi @kuiwang02

/lgtm cancel
because of https://github.com/openshift/operator-framework-operator-controller/pull/403/files#r2199686792
others are lgtmed.

Fixed. My main branch was outdated that is why it endup missing 2 lines
Added back. Thank you 👍

@camilamacedo86 camilamacedo86 requested a review from kuiwang02 July 11, 2025 08:15
@kuiwang02
Copy link
Contributor

@camilamacedo86 thanks for quick action.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2025
@kuiwang02
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 11, 2025

@camilamacedo86: This pull request references OPRUN-3963 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Due to current limitations, it appears we cannot maintain a dedicated Dockerfile solely for injecting the binary into OCP images while keeping it isolated and registered cleanly in openshift/origin.

This PR introduces the following changes:

  • Removes the Dockerfile used for testing purposes under the test-extension/ directory
  • Modifies the existing operator-controller.Dockerfile to directly add the required binary, ensuring it is included in the build process without relying on a separate image context.

These changes streamline the build pipeline while aligning with OCP image handling constraints.
The changes here is to allow us : openshift/origin#29949

Important
We could confirm that works

See that we run the test with this PR: https://github.com/openshift/origin/pull/29949/checks?check_run_id=45783243053

And looking the logs we can see the bin: https://prow.ci.openshift.org/log?container=test&id=1943585495564947456&job=multi-pr-openshift-origin-29949-openshift-origin-29949-openshift-operator-framework-operator-controller-403-e2e-aws

td33vcth/release@sha256:08990a8bdb91b81ab33f769cdf95f9064e50efe8ad54f4c531ba86893e3a7d17\" in 4.105449064s"
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:d766bc767b156efdb0e9ffc6e1c2ce726654171ddef3c8879dc00f40a0073698\" and src \"/usr/bin/k8s-tests-ext.gz\""
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:66d10a3bf99d8629c116d3477e47f24903fe3cb363660715a6bec12d9de36520\" and src \"/usr/bin/olmv1-tests-ext.gz\""
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:550d400881c3af8ee8664c213cc2c54398eede1f1c651bf7ff49abe7b6f82c53\" and src \"/machine-api-tests-ext.gz\""
time="2025-07-11T09:54:38Z" level=info msg="Completed image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:66d10a3bf99d8629c116d3477e47f24903fe3cb363660715a6bec12d9de36520\" in 4.840620234s"
time="2025-07-11T09:54:39Z" level=info msg="Extracted /usr/bin/olmv1-tests-ext.gz for tag olm-operator-con

Without this PR we see the error when the olmv1 ext bin is not found see:

4ymjgg19/stable@sha256:550d400881c3af8ee8664c213cc2c54398eede1f1c651bf7ff49abe7b6f82c53 (disk size 196843640, extraction duration 16.282630961s)"
error: couldn't retrieve test suites: failed to extract test binaries: encountered errors while extracting binaries: extracted binary at path "/tmp/home/.cache/openshift-tests/registry_build05_ci_openshift_org_ci-op-4ymjgg19_release_sha256_cff178b5c02fb845adbae958b60afa2f7a4e566ac3dd01160fe6c6a1f03cef6b_4892638eaf24/olmv1-tests-ext.gz" does not exist. the src path "/usr/bin/olmv1-tests-ext.gz" doesn't exist in image "registry.build05.ci.openshift.org/ci-op-4ymjgg19/stable@sha256:258241c69ae022719a65404f28a44fd22ea7b6817413341caf665c13b8084ee4". note the version of origin needs to match the version of the cluster under test

IN: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/29949/pull-ci-openshift-origin-main-e2e-aws/1942986031485685760

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 openshift-eng/jira-lifecycle-plugin repository.

@camilamacedo86 camilamacedo86 changed the title OPRUN-3963: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests OPRUN-3965: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests Jul 11, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 11, 2025

@camilamacedo86: This pull request references OPRUN-3965 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Due to current limitations, it appears we cannot maintain a dedicated Dockerfile solely for injecting the binary into OCP images while keeping it isolated and registered cleanly in openshift/origin.

This PR introduces the following changes:

  • Removes the Dockerfile used for testing purposes under the test-extension/ directory
  • Modifies the existing operator-controller.Dockerfile to directly add the required binary, ensuring it is included in the build process without relying on a separate image context.

These changes streamline the build pipeline while aligning with OCP image handling constraints.
The changes here is to allow us : openshift/origin#29949

Important
We could confirm that works

See that we run the test with this PR: https://github.com/openshift/origin/pull/29949/checks?check_run_id=45783243053

And looking the logs we can see the bin: https://prow.ci.openshift.org/log?container=test&id=1943585495564947456&job=multi-pr-openshift-origin-29949-openshift-origin-29949-openshift-operator-framework-operator-controller-403-e2e-aws

td33vcth/release@sha256:08990a8bdb91b81ab33f769cdf95f9064e50efe8ad54f4c531ba86893e3a7d17\" in 4.105449064s"
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:d766bc767b156efdb0e9ffc6e1c2ce726654171ddef3c8879dc00f40a0073698\" and src \"/usr/bin/k8s-tests-ext.gz\""
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:66d10a3bf99d8629c116d3477e47f24903fe3cb363660715a6bec12d9de36520\" and src \"/usr/bin/olmv1-tests-ext.gz\""
time="2025-07-11T09:54:34Z" level=info msg="Run image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:550d400881c3af8ee8664c213cc2c54398eede1f1c651bf7ff49abe7b6f82c53\" and src \"/machine-api-tests-ext.gz\""
time="2025-07-11T09:54:38Z" level=info msg="Completed image extract for release image \"registry.build05.ci.openshift.org/ci-op-td33vcth/stable@sha256:66d10a3bf99d8629c116d3477e47f24903fe3cb363660715a6bec12d9de36520\" in 4.840620234s"
time="2025-07-11T09:54:39Z" level=info msg="Extracted /usr/bin/olmv1-tests-ext.gz for tag olm-operator-con

Without this PR we see the error when the olmv1 ext bin is not found see:

4ymjgg19/stable@sha256:550d400881c3af8ee8664c213cc2c54398eede1f1c651bf7ff49abe7b6f82c53 (disk size 196843640, extraction duration 16.282630961s)"
error: couldn't retrieve test suites: failed to extract test binaries: encountered errors while extracting binaries: extracted binary at path "/tmp/home/.cache/openshift-tests/registry_build05_ci_openshift_org_ci-op-4ymjgg19_release_sha256_cff178b5c02fb845adbae958b60afa2f7a4e566ac3dd01160fe6c6a1f03cef6b_4892638eaf24/olmv1-tests-ext.gz" does not exist. the src path "/usr/bin/olmv1-tests-ext.gz" doesn't exist in image "registry.build05.ci.openshift.org/ci-op-4ymjgg19/stable@sha256:258241c69ae022719a65404f28a44fd22ea7b6817413341caf665c13b8084ee4". note the version of origin needs to match the version of the cluster under test

IN: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/29949/pull-ci-openshift-origin-main-e2e-aws/1942986031485685760

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 openshift-eng/jira-lifecycle-plugin repository.

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

8 similar comments
@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@tmshort
Copy link
Contributor

tmshort commented Jul 14, 2025

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, kuiwang02, tmshort

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 14, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD cba0e4c and 2 for PR HEAD 7c90025 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD cba0e4c and 2 for PR HEAD 7c90025 in total

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 068702d and 1 for PR HEAD 7c90025 in total

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

2 similar comments
@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 068702d and 2 for PR HEAD 7c90025 in total

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ec7811b and 1 for PR HEAD 7c90025 in total

@camilamacedo86
Copy link
Contributor Author

/test openshift-e2e-aws

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 16, 2025

@camilamacedo86: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 7c90025 link false /test okd-scos-e2e-aws-ovn
ci/prow/openshift-e2e-aws-techpreview 7c90025 link false /test openshift-e2e-aws-techpreview

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 7adf9ce and 2 for PR HEAD 7c90025 in total

@openshift-merge-bot openshift-merge-bot bot merged commit 982e725 into openshift:main Jul 16, 2025
10 of 12 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-olm-operator-controller
This PR has been included in build ose-olm-operator-controller-container-v4.20.0-202507161450.p0.g982e725.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-olm-catalogd
This PR has been included in build ose-olm-catalogd-container-v4.20.0-202507161450.p0.g982e725.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants