Skip to content

OCPQE-17433: Add OperatorLifecycleManager Cap for v415#44644

Merged
openshift-ci[bot] merged 1 commit intoopenshift:masterfrom
yunjiang29:v415-olm
Oct 23, 2023
Merged

OCPQE-17433: Add OperatorLifecycleManager Cap for v415#44644
openshift-ci[bot] merged 1 commit intoopenshift:masterfrom
yunjiang29:v415-olm

Conversation

@yunjiang29
Copy link
Copy Markdown
Contributor

@yunjiang29 yunjiang29 commented Oct 20, 2023 •
edited
Loading

@openshift-ci openshift-ci Bot requested review from gpei and jinyunma October 20, 2023 08:19
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2023
@yunjiang29 yunjiang29 changed the title v415-olm Add OperatorLifecycleManager Cap for v415 Oct 20, 2023
@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 20, 2023

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 20, 2023
@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 20, 2023

cc @jinyunma @jianlinliu for awareness of this change, still in WIP

jianlinliu
jianlinliu reviewed Oct 20, 2023
View reviewed changes
Comment thread ...gistry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh Outdated
Copy link
Copy Markdown
Contributor

@jianlinliu jianlinliu Oct 20, 2023

Choose a reason for hiding this comment

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

can you help also update ipi-conf-capability-additonalcaps together?

Copy link
Copy Markdown
Contributor Author

@yunjiang29 yunjiang29 Oct 20, 2023

Choose a reason for hiding this comment

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

Updated.

@jianlinliu
Copy link
Copy Markdown
Contributor

jianlinliu commented Oct 20, 2023

openshift/installer#7495

I am not sure if this will bring some change for enable-qe-catalogsource step, but at least from the job, even we set none baseline capacity, sounds like the step get passed. cc @jianzhangbjz

@jinyunma
Copy link
Copy Markdown
Contributor

jinyunma commented Oct 20, 2023

@yunjiang29 thanks fro addressing this.
I also noticed this change and failed jobs ( tracked in OCPQE-17433).
Since v4.15 cap set is not supported on installer and API, dev is working on it (openshift/api#1629), so I'm waiting v4.15 cap set be added and then fix all related steps in Prow.

jinyunma
jinyunma reviewed Oct 20, 2023
View reviewed changes
Comment thread ...gistry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh Outdated
Copy link
Copy Markdown
Contributor

@jinyunma jinyunma Oct 20, 2023

Choose a reason for hiding this comment

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

this capability includes several operators:

caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lifecycle-manager-catalog operator-lifecycle-manager-packageserver"

Copy link
Copy Markdown
Contributor Author

@yunjiang29 yunjiang29 Oct 20, 2023

Choose a reason for hiding this comment

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

Updated.

@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 20, 2023

Since v4.15 cap set is not supported on installer and API, dev is working on it (openshift/api#1629), so I'm waiting v4.15 cap set be added and then fix all related steps in Prow.

Ha, the PR just got merged 20 hours ago.

@jinyunma
Copy link
Copy Markdown
Contributor

jinyunma commented Oct 20, 2023

Since v4.15 cap set is not supported on installer and API, dev is working on it (openshift/api#1629), so I'm waiting v4.15 cap set be added and then fix all related steps in Prow.

Ha, the PR just got merged 20 hours ago.

yeah, but still need to bump this API version on installer and CVO, then v4.15 cap set should be worked.

@yunjiang29 yunjiang29 changed the title Add OperatorLifecycleManager Cap for v415 OCPQE-17433: Add OperatorLifecycleManager Cap for v415 Oct 20, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 20, 2023
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Oct 20, 2023 •
edited by openshift-ci Bot
Loading

@yunjiang29: This pull request references OCPQE-17433 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 task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

openshift/installer#7495

failed CI job: https://qe-private-deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gs/qe-private-deck/logs/periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-ipi-baselinecaps-none-custom-sg-f14/1714915210466168832

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.

@jianlinliu
Copy link
Copy Markdown
Contributor

jianlinliu commented Oct 20, 2023 •
edited
Loading

but still need to bump this API version on installer and CVO, then v4.15 cap set should be worked.

We just need to wait for installer and CVO get bumped to check the future ci jobs results, but no need to update the script any more once this PR get merged, should not block the PR merging, right?

@jinyunma
Copy link
Copy Markdown
Contributor

jinyunma commented Oct 20, 2023

but still need to bump this API version on installer and CVO, then v4.15 cap set should be worked.

We just need to wait for installer and CVO get bumped to check the future ci jobs results, but no need to update the script any more once this PR get merged, should not block the PR merging, right?

From installer PR, I also found the pre-check for marketplace and OperatorLifecycleManage.
the marketplace capability requires the OperatorLifecycleManage

when OperatorLifecycleManage is selected to be disabled, should disable marketplace together.

so also need to add similar logical in ipi-conf-capability-additonalcaps as what we did for ImageRegistry and Build.

@jianlinliu
Copy link
Copy Markdown
Contributor

jianlinliu commented Oct 20, 2023

when OperatorLifecycleManage is selected to be disabled, should disable marketplace together.

Ah, right.

@jinyunma
Copy link
Copy Markdown
Contributor

jinyunma commented Oct 20, 2023 •
edited
Loading

@yunjiang29 step ipi-conf-manual-creds-remove-unnecessary-creds also needs to be update to support v4.15 although it has no impact so far as no secrets requires to be removed for new added caps.

Edit: please ignore this comments, seems not required as it can be managed by EXTRACT_MANIFEST_INCLUDED: "true"

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Oct 23, 2023

[REHEARSALNOTIFIER]
@yunjiang29: 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-azure-file-csi-driver-master-e2e-azure-file-csi-extended openshift/azure-file-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-release-4.16-e2e-azure-file-csi-extended openshift/azure-file-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-release-4.15-e2e-azure-file-csi-extended openshift/azure-file-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-release-4.14-e2e-azure-file-csi-extended openshift/azure-file-csi-driver presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-master-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-release-4.16-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-release-4.15-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-release-4.14-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-operator-main-e2e-azure-file-csi-extended openshift/azure-file-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-operator-release-4.16-e2e-azure-file-csi-extended openshift/azure-file-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-operator-release-4.15-e2e-azure-file-csi-extended openshift/azure-file-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-file-csi-driver-operator-release-4.14-e2e-azure-file-csi-extended openshift/azure-file-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-aws-ebs-csi-driver-operator-master-e2e-aws-csi-extended openshift/aws-ebs-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.16-e2e-aws-csi-extended openshift/aws-ebs-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.15-e2e-aws-csi-extended openshift/aws-ebs-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-aws-ebs-csi-driver-operator-release-4.14-e2e-aws-csi-extended openshift/aws-ebs-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-cluster-etcd-operator-master-e2e-gcp-qe-no-capabilities openshift/cluster-etcd-operator presubmit Registry content changed
pull-ci-openshift-cluster-etcd-operator-release-4.16-e2e-gcp-qe-no-capabilities openshift/cluster-etcd-operator presubmit Registry content changed
pull-ci-openshift-cluster-etcd-operator-release-4.15-e2e-gcp-qe-no-capabilities openshift/cluster-etcd-operator presubmit Registry content changed
pull-ci-openshift-cluster-etcd-operator-release-4.14-e2e-gcp-qe-no-capabilities openshift/cluster-etcd-operator presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-master-e2e-vsphere-csi-extended openshift/vmware-vsphere-csi-driver presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-release-4.16-e2e-vsphere-csi-extended openshift/vmware-vsphere-csi-driver presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-release-4.15-e2e-vsphere-csi-extended openshift/vmware-vsphere-csi-driver presubmit Registry content changed
pull-ci-openshift-vmware-vsphere-csi-driver-release-4.14-e2e-vsphere-csi-extended openshift/vmware-vsphere-csi-driver presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-operator-master-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-operator-release-4.16-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-operator-release-4.15-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-gcp-pd-csi-driver-operator-release-4.14-e2e-gcp-csi-extended openshift/gcp-pd-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-operator-master-e2e-azure-csi-extended openshift/azure-disk-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-operator-release-4.16-e2e-azure-csi-extended openshift/azure-disk-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-operator-release-4.15-e2e-azure-csi-extended openshift/azure-disk-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-operator-release-4.14-e2e-azure-csi-extended openshift/azure-disk-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-gcp-filestore-csi-driver-operator-main-operator-e2e-extended openshift/gcp-filestore-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.16-operator-e2e-extended openshift/gcp-filestore-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-gcp-filestore-csi-driver-operator-release-4.15-operator-e2e-extended openshift/gcp-filestore-csi-driver-operator presubmit Registry content changed

A total of 2835 jobs have been affected by this change. The above listing is non-exhaustive and limited to 35 jobs.

A full list of affected jobs can be found here

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.

@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 23, 2023

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-ipi-baselinecaps-none-custom-sg-f14

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Oct 23, 2023 •
edited by openshift-ci Bot
Loading

@yunjiang29: This pull request references OCPQE-17433 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 task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

openshift/installer#7495
openshift/api#1589
openshift/api#1629

failed CI job: https://qe-private-deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gs/qe-private-deck/logs/periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-ipi-baselinecaps-none-custom-sg-f14/1714915210466168832

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.

@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 23, 2023

The change is available in 4.15.0-0.nightly-2023-10-20-214244, but CI job picks up 4.15.0-0.nightly-2023-10-17-065657 ATM, so the rehearse job failed.

@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 23, 2023

@jianlinliu @jinyunma do you think we can merge this right now or wait for a build available to test.

@jianlinliu
Copy link
Copy Markdown
Contributor

jianlinliu commented Oct 23, 2023

/lgtm

leave @jinyunma for final confirm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2023
@jinyunma
Copy link
Copy Markdown
Contributor

jinyunma commented Oct 23, 2023

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianlinliu, jinyunma, yunjiang29

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

@jianlinliu
Copy link
Copy Markdown
Contributor

jianlinliu commented Oct 23, 2023

From the rehearse job log:

ERROR: capability OperatorLifecycleManager: operator operator-lifecycle-manager -- found
ERROR: capability OperatorLifecycleManager: operator operator-lifecycle-manager-catalog -- found
ERROR: capability OperatorLifecycleManager: operator operator-lifecycle-manager-packageserver -- found

Is that a known issue?

@jinyunma
Copy link
Copy Markdown
Contributor

jinyunma commented Oct 23, 2023

From the rehearse job log:

ERROR: capability OperatorLifecycleManager: operator operator-lifecycle-manager -- found
ERROR: capability OperatorLifecycleManager: operator operator-lifecycle-manager-catalog -- found
ERROR: capability OperatorLifecycleManager: operator operator-lifecycle-manager-packageserver -- found

Is that a known issue?

because openshift/installer#7495 is not landed into accepted nightly build.

@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 23, 2023

/unhold

@yunjiang29
Copy link
Copy Markdown
Contributor Author

yunjiang29 commented Oct 23, 2023

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Oct 23, 2023
@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 Oct 23, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 23, 2023

@yunjiang29: 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/periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-ipi-baselinecaps-none-custom-sg-f14 394f068 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-aws-ipi-baselinecaps-none-custom-sg-f14

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-ci openshift-ci Bot merged commit 370c3b9 into openshift:master Oct 23, 2023
@yunjiang29 yunjiang29 deleted the v415-olm branch January 2, 2024 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpei gpei Awaiting requested review from gpei

2 more reviewers

@jianlinliu jianlinliu jianlinliu left review comments

@jinyunma jinyunma jinyunma left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jianlinliu jianlinliu

@jinyunma jinyunma

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yunjiang29 @jianlinliu @jinyunma @openshift-ci-robot