Skip to content

Conversation

@shellyyang1989
Copy link
Contributor

Per https://redhat-internal.slack.com/archives/CH76YSYSC/p1691119535303039, adding operator stanza to enable PR pre-merge test for cincinnati.

@openshift-ci-robot
Copy link
Contributor

@shellyyang1989, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

could not load configuration from candidate revision of release repo: failed to load ci-operator configuration from release repo: invalid ci-operator config: invalid configuration: importing the release stream is required to ensure the promoted images to the namespace ocp can be integrated properly. Although it can be achieved by tag_specification or releases["latest"], adding an e2e test is strongly suggested
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci openshift-ci bot requested review from petr-muller and wking August 7, 2023 08:20
@jianzhangbjz
Copy link
Member

Please run make update to update all related jobs.

@petr-muller
Copy link
Member

Doing some experiments in #42113 and https://github.com/openshift/cincinnati-operator/tree/bundle-dockerfile

Maybe we'll need promotion after all but not to ocp

@jianzhangbjz
Copy link
Member

Maybe we'll need promotion after all but not to ocp

Thanks! I guess we can promote it to the ci namespace.

@petr-muller
Copy link
Member

petr-muller commented Aug 9, 2023

Thanks! I guess we can promote it to the ci namespace.

No, rather something ours, like cincinnati

EDIT: I see there's already cincinnati-ci-public and cincinnati-ci

@openshift-ci-robot
Copy link
Contributor

@shellyyang1989, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

could not load configuration from candidate revision of release repo: failed to load ci-operator configuration from release repo: invalid ci-operator config: invalid configuration: importing the release stream is required to ensure the promoted images to the namespace ocp can be integrated properly. Although it can be achieved by tag_specification or releases["latest"], adding an e2e test is strongly suggested
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

Copy link
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have filed openshift/cincinnati-operator#173 to create the necessary bundle files in the operator repo and suggested the matching changes in this repository.

@shellyyang1989 can you add (temporarily) an item to tests that would install the bundle? That would give us not only a rehearsal that builds the image but also a rehearsal that tries to install it. I have written the test stanza here:

- as: install-bundle
cluster_claim:
architecture: amd64
cloud: aws
owner: openshift-ci
product: ocp
timeout: 1h0m0s
version: "4.13"
steps:
test:
- as: install
cli: latest
commands: |
oc create namespace install-osus-here
operator-sdk run bundle -n install-osus-here "$OO_BUNDLE"
oc wait --for condition=Available -n install-osus-here deployment updateservice-operator
dependencies:
- env: OO_BUNDLE
name: cincinnati-operator-bundle
from: operator-sdk
resources:
requests:
cpu: 500m
memory: 1000Mi
workflow: generic-claim

You'd also need to include a sdk image (

operator-sdk:
name: "4.13"
namespace: origin
tag: operator-sdk
) and make sure the bundle image matches the one we built (we're calling the bundle cincinnati-bundle here but I called it differently in )

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2023
@openshift-ci-robot
Copy link
Contributor

@shellyyang1989, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

couldn't prepare candidate: couldn't rebase repo client
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2023
@shellyyang1989
Copy link
Contributor Author

/pj-rehearse pull-ci-openshift-cincinnati-operator-master-ci-bundle-cincinnati-bundle pull-ci-openshift-cincinnati-operator-master-install-bundle

@shellyyang1989
Copy link
Contributor Author

bundle.Dockerfile is being enabled here openshift/cincinnati-operator#173

@petr-muller
Copy link
Member

/pj-rehearse

openshift/cincinnati-operator#173 merged :shipit:

@petr-muller
Copy link
Member

install-bundle passed 🎉

namespace/install-osus-here created
time="2023-08-10T18:36:20Z" level=info msg="Creating a File-Based Catalog of the bundle \"registry.build05.ci.openshift.org/ci-op-scth0tj4/pipeline@sha256:659464ca4855a1809652ac34678424b0f94357e301ee28528c44d6d36bc53c84\""
time="2023-08-10T18:36:20Z" level=info msg="Generated a valid File-Based Catalog"
time="2023-08-10T18:36:25Z" level=info msg="Created registry pod: 59464ca4855a1809652ac34678424b0f94357e301ee28528c44d6d36bc53c84"
time="2023-08-10T18:36:25Z" level=info msg="Created CatalogSource: update-service-operator-catalog"
time="2023-08-10T18:36:25Z" level=info msg="OperatorGroup \"operator-sdk-og\" created"
time="2023-08-10T18:36:25Z" level=info msg="Created Subscription: update-service-operator-v5-0-2-dev-sub"
time="2023-08-10T18:36:30Z" level=info msg="Approved InstallPlan install-nt5bn for the Subscription: update-service-operator-v5-0-2-dev-sub"
time="2023-08-10T18:36:30Z" level=info msg="Waiting for ClusterServiceVersion \"install-osus-here/update-service-operator.v5.0.2-dev\" to reach 'Succeeded' phase"
time="2023-08-10T18:36:30Z" level=info msg="  Waiting for ClusterServiceVersion \"install-osus-here/update-service-operator.v5.0.2-dev\" to appear"
time="2023-08-10T18:36:53Z" level=info msg="  Found ClusterServiceVersion \"install-osus-here/update-service-operator.v5.0.2-dev\" phase: Pending"
time="2023-08-10T18:36:54Z" level=info msg="  Found ClusterServiceVersion \"install-osus-here/update-service-operator.v5.0.2-dev\" phase: Installing"
time="2023-08-10T18:37:01Z" level=info msg="  Found ClusterServiceVersion \"install-osus-here/update-service-operator.v5.0.2-dev\" phase: Succeeded"
time="2023-08-10T18:37:01Z" level=info msg="OLM has successfully installed \"update-service-operator.v5.0.2-dev\""
deployment.apps/updateservice-operator condition met

@shellyyang1989 shellyyang1989 changed the title Draft: Enable pre-merge test for cincinnati Enable pre-merge test for cincinnati Aug 11, 2023
@petr-muller
Copy link
Member

petr-muller commented Aug 11, 2023

/retitle OTA-1007: Enable pre-merge test for cincinnati

@openshift-ci openshift-ci bot changed the title OTA-1007 Enable pre-merge test for cincinnati OTA-1007: Enable pre-merge test for cincinnati Aug 11, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Aug 11, 2023

@shellyyang1989: This pull request references OTA-1007 which is a valid jira issue.

Details

In response to this:

Per https://redhat-internal.slack.com/archives/CH76YSYSC/p1691119535303039, adding operator stanza to enable PR pre-merge test for cincinnati.

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 11, 2023
@petr-muller
Copy link
Member

/lgtm cancel

Let me verify one more thing, maybe we'll need to do some renames in our configs (see my JIRA comment)

Specifically, maybe we'll need to somehow rename our operand image in the operator config so that cluster-bot is able to find it:

https://github.com/openshift/release/pull/42053/files#diff-3e4c9ff59bb36d000ea248cbef83680065c76329d216d38ce61c00fb798d3e94R6-R9

@openshift-ci openshift-ci bot removed lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 11, 2023
@shellyyang1989
Copy link
Contributor Author

/lgtm cancel

Let me verify one more thing, maybe we'll need to do some renames in our configs (see my JIRA comment)

Specifically, maybe we'll need to somehow rename our operand image in the operator config so that cluster-bot is able to find it:

https://github.com/openshift/release/pull/42053/files#diff-3e4c9ff59bb36d000ea248cbef83680065c76329d216d38ce61c00fb798d3e94R6-R9

I spoke to @jianzhangbjz about it and seems like any image name is fine.

@petr-muller
Copy link
Member

This looks promising...

https://github.com/openshift/ci-chat-bot/blob/0bd1bfd3ca0294338abfd861863c1e096143b84d/pkg/manager/prow.go#L716

Right, so the match between the names needs to be between the to (name of the image) in the operand-building repo and base_images.[].tag in the operator one. And there's an implicit match when there's promotion and no renaming shenanigans. So this should work.

My only concern is that our variant config will confuse cluster bot a bit. We promote the deploy image built from the __customrust variant:

https://github.com/openshift/release/blob/49a3c7ed4ff702ba458bd569ae3dc43e06f3a2cf/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master__customrust.yaml#L44C49-L45

but we also build the same image in the main file:
https://github.com/openshift/release/blob/49a3c7ed4ff702ba458bd569ae3dc43e06f3a2cf/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml#L40-L45C9

It does not seem cluster-bot is taking variants into account, so maybe the the resulting bundle will inject the "standard" deploy file instead of the __customrust one. The difference is mainly in Dockerfiles used (customrust vs standard).

Which is fine, I guess? The point of pre-merge testing is more to test the code, not the productized artifact (which will only be built after merge anyway).

/lgtm

So to me this looks good, feel free to unhold or modify at will (see my previous comment about the hold)

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 14, 2023
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 14, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 14, 2023
@openshift-ci-robot
Copy link
Contributor

@shellyyang1989, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

could not load configuration from candidate revision of release repo: failed to load Prow configuration from release repo: [duplicated presubmit job: pull-ci-openshift-cincinnati-operator-master-ci-bundle-cincinnati-bundle, duplicated presubmit job: pull-ci-openshift-cincinnati-operator-master-install-bundle]
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@shellyyang1989: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-cincinnati-operator-master-ci-bundle-cincinnati-bundle openshift/cincinnati-operator presubmit Presubmit changed
pull-ci-openshift-cincinnati-operator-master-install-bundle openshift/cincinnati-operator presubmit Presubmit changed
pull-ci-openshift-cincinnati-operator-master-gofmt openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-images openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-410 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-411 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-412 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-413 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-414 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-410 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-411 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-412 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-413 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus-414 openshift/cincinnati-operator presubmit Ci-operator config changed
pull-ci-openshift-cincinnati-operator-master-unit openshift/cincinnati-operator presubmit Ci-operator config changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@shellyyang1989
Copy link
Contributor Author

The install-bundle job will not bother us right? I'm fine to leave it as it is. Thank you Petr for your help and support.

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 14, 2023
@petr-muller
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: petr-muller, shellyyang1989

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

@petr-muller
Copy link
Member

/pj-rehearse

@petr-muller
Copy link
Member

INFO[2023-08-14T13:26:27Z] Running step install-bundle-openshift-configure-cincinnati. 
INFO[2023-08-14T13:26:35Z] Step install-bundle-openshift-configure-cincinnati succeeded after 8s. 

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 14, 2023
@petr-muller
Copy link
Member

/refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 14, 2023

@shellyyang1989: The following test 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/rehearse/openshift/cincinnati-operator/master/install-bundle 742a90e link unknown /pj-rehearse pull-ci-openshift-cincinnati-operator-master-install-bundle

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

@openshift-merge-robot openshift-merge-robot merged commit 79f7f48 into openshift:master Aug 14, 2023
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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants