Skip to content

Conversation

@sunzhaohua2
Copy link
Contributor

@sunzhaohua2 sunzhaohua2 commented Mar 11, 2024

Add CloudControllerManager and Ingress Cap for v416
Add a new job on baremetal to test disable ccm on baremetal works well.
@jinyunma @shellyyang1989 @jianlinliu @lihongan @huali9 @miyadav PTAL

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 11, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 11, 2024

@sunzhaohua2: This pull request references OCPQE-19978 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.16.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 openshift-ci bot requested review from dgoodwin and gpei March 11, 2024 09:01
@sunzhaohua2 sunzhaohua2 force-pushed the ccm-optional branch 2 times, most recently from 22fe2e1 to 446d8b3 Compare March 13, 2024 02:18
@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-baremetal-ipi-ovn-ipv4-basecap-none-f28

@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14

@jinyunma
Copy link
Contributor

@sunzhaohua2 , failed job:

ERROR: known capabilities does not match with cvo .status.capabilities.knownCapabilities!
cvo_caps: Build CSISnapshot CloudControllerManager CloudCredential Console DeploymentConfig ImageRegistry Ingress Insights MachineAPI NodeTuning OperatorLifecycleManager Storage baremetal marketplace openshift-samples
known capability set: Build CSISnapshot CloudControllerManager CloudCredential Console DeploymentConfig ImageRegistry Insights MachineAPI NodeTuning OperatorLifecycleManager Storage baremetal marketplace openshift-samples
diff [cvo_caps] [known capability set]
8d7
< Ingress 

We also need to add capability Ingress in related steps.
From this enhancement doc, and PR, Ingress will be always enabled on standalone cluster through setting flag in cvo, I guess we don't need to set capability Ingress in job config level to enable it explicitly. cc @lihongan to double check.

@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2024
@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14

@openshift-ci-robot
Copy link
Contributor

@sunzhaohua2: job(s): periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14 either don't exist or were not found to be affected, and cannot be rehearsed

@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f7

@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f7

@sunzhaohua2
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-baremetal-ipi-ovn-ipv4-basecap-none-f28

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 14, 2024

@sunzhaohua2: This pull request references OCPQE-19978 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.16.0" version, but no target version was set.

Details

In response to this:

Add CloudControllerManager Cap for v416
Add a new job on baremetal to test disable ccm on baremetal works well.
@jinyunma @shellyyang1989 @jianlinliu @lihongan @huali9 @miyadav PTAL

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_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential CloudControllerManager
Copy link
Contributor

Choose a reason for hiding this comment

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

The job is for testing none capability on purpose, ideally we should not enable any additional caps, while because MachineAPI and CloudCredential has to be enabled because the IPI install has to require them.

While for the added CCM and Ingress, is that the same case? The IPI install has to require them because of some known limiation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

CCM can only be disabled on "none", "baremetal" or "external" platform with ccm none clusters, so has to be enabled on cloud clusters.
Ingress is always enabled on ocp, only disabled on hypershift

v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
v415=" ${v414} OperatorLifecycleManager CloudCredential"
latest_defined="v415"
v416=" ${v415} CloudControllerManager Ingress"
Copy link
Contributor

Choose a reason for hiding this comment

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

Ingress also become optional cap in 4.16?

Copy link
Contributor

Choose a reason for hiding this comment

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

If yes, can you also help update the PR title and description to include it.

@shellyyang1989
Copy link
Contributor

Upgrade change looks good to me. Please also run a 4.15 to 4.16 upgrade job to verify the change. Thanks

selected_capability=""
;;
"CloudControllerManager")
platform_type=$(yq-go r "${SHARED_DIR}/install-config.yaml" "platform" | sed -n '1p' | cut -d':' -f1)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
platform_type=$(yq-go r "${SHARED_DIR}/install-config.yaml" "platform" | sed -n '1p' | cut -d':' -f1)
platform_type=$(yq-go r -j "${SHARED_DIR}/install-config.yaml" "platform" | jq -r 'keys[]')

test:
- chain: openshift-e2e-test-qe
workflow: baremetal-lab-ipi
- as: baremetal-ipi-ovn-ipv4-basecap-none-f28
Copy link
Contributor

Choose a reason for hiding this comment

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

ci job are placed in alphabetical order, sounds like we should move this job a bit earlier.

@jianlinliu
Copy link
Contributor

@sunzhaohua2 , failed job:

ERROR: known capabilities does not match with cvo .status.capabilities.knownCapabilities!
cvo_caps: Build CSISnapshot CloudControllerManager CloudCredential Console DeploymentConfig ImageRegistry Ingress Insights MachineAPI NodeTuning OperatorLifecycleManager Storage baremetal marketplace openshift-samples
known capability set: Build CSISnapshot CloudControllerManager CloudCredential Console DeploymentConfig ImageRegistry Insights MachineAPI NodeTuning OperatorLifecycleManager Storage baremetal marketplace openshift-samples
diff [cvo_caps] [known capability set]
8d7
< Ingress 

We also need to add capability Ingress in related steps. From this enhancement doc, and PR, Ingress will be always enabled on standalone cluster through setting flag in cvo, I guess we don't need to set capability Ingress in job config level to enable it explicitly. cc @lihongan to double check.

If we did not enable Ingress explicitly in basecap=none install, will ingress still be installed and works well?

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 21, 2024
@jianlinliu
Copy link
Contributor

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Mar 21, 2024
@jianlinliu
Copy link
Contributor

cc @liangxia to review

@liangxia
Copy link
Member

/lgtm

@jianlinliu
Copy link
Contributor

@wking can you help review ci-operator/config/openshift/release/ part?

@liangxia
Copy link
Member

/assign @xueqzhan

@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed lgtm Indicates that a PR is ready to be merged. labels Mar 27, 2024
@openshift-ci-robot openshift-ci-robot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Mar 27, 2024
@sunzhaohua2
Copy link
Contributor Author

/retest

@jianlinliu
Copy link
Contributor

/test core-valid

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 27, 2024

@sunzhaohua2: 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/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14 e300486 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f7 3aeeac6 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f7
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-baremetal-ipi-ovn-ipv4-basecap-none-f28 3aeeac6 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-baremetal-ipi-ovn-ipv4-basecap-none-f28
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-azure-ipi-basecap-vset-additionalcap-arm-f7 08a085e link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-azure-ipi-basecap-vset-additionalcap-arm-f7
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-4.16-upgrade-from-stable-4.15-aws-upi-basecap-none-f28 e713fde link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-amd64-nightly-4.16-upgrade-from-stable-4.15-aws-upi-basecap-none-f28

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-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@sunzhaohua2: 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-disk-csi-driver-master-e2e-azure-csi-extended openshift/azure-disk-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-release-4.17-e2e-azure-csi-extended openshift/azure-disk-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-release-4.16-e2e-azure-csi-extended openshift/azure-disk-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-release-4.15-e2e-azure-csi-extended openshift/azure-disk-csi-driver presubmit Registry content changed
pull-ci-openshift-azure-disk-csi-driver-release-4.14-e2e-azure-csi-extended openshift/azure-disk-csi-driver 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-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.17-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-ibm-vpc-block-csi-driver-operator-master-e2e-ibmcloud-csi-extended openshift/ibm-vpc-block-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-ibm-vpc-block-csi-driver-operator-release-4.17-e2e-ibmcloud-csi-extended openshift/ibm-vpc-block-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-ibm-vpc-block-csi-driver-operator-release-4.16-e2e-ibmcloud-csi-extended openshift/ibm-vpc-block-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-ibm-vpc-block-csi-driver-operator-release-4.15-e2e-ibmcloud-csi-extended openshift/ibm-vpc-block-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-ibm-vpc-block-csi-driver-operator-release-4.14-e2e-ibmcloud-csi-extended openshift/ibm-vpc-block-csi-driver-operator presubmit Registry content changed
pull-ci-openshift-ibm-vpc-node-label-updater-release-4.15-e2e-ibmcloud-csi-extended openshift/ibm-vpc-node-label-updater presubmit Registry content changed
pull-ci-openshift-ibm-vpc-node-label-updater-release-4.14-e2e-ibmcloud-csi-extended openshift/ibm-vpc-node-label-updater 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.17-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-aws-efs-csi-driver-operator-master-operator-e2e-extended openshift/aws-efs-csi-driver-operator presubmit Registry content changed

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

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 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 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 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.

@jianlinliu
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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
Contributor

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Mar 27, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit bbb31f9 into openshift:master Mar 27, 2024
wking added a commit to wking/openshift-release that referenced this pull request Apr 17, 2024
…er to "no-capabilities"

Similar to bbb31f9 (OCPQE-19978: Add CloudControllerManager Cap for
v416, 2024-03-27, openshift#49708), because [1] explains:

  disabling CloudControllerManager is only supported on the Baremetal, None, or External platform with cloudControllerManager value none

Besides the release periodics, I'm also touching the cluster-bot job
definitions in openshift-release-infra-periodics.yaml.  AWS, Azure,
and GCP will all need this new capability.  I'm not clear on the
packet-assisted job from 6544a41 (periodics: add assisted launch
job, 2024-02-12, openshift#48700), and I cannot figure out the Cluster Bot
launch syntax to trigger that path.  So for now, I'm adding the new
capability there too, to avoid forking the configuration without a
clearer understanding of the context.

This change will break these Cluster Bot jobs for 4.15 and earlier,
where the new capability does not exist or match the ClusterVersion
enum.  But they're already generally available, so folks may not need
access, and if they do, hackery like 428ef75
(ci-operator/jobs/openshift/release/openshift-release-infra-periodics:
Temporarily drop MachineAPI from Azure Cluster Bot job, 2023-10-23,
openshift#44751) can restore it.

[1]: openshift/installer@2dc1ef8
openshift-merge-bot bot pushed a commit that referenced this pull request Apr 18, 2024
…er to "no-capabilities" (#51070)

Similar to bbb31f9 (OCPQE-19978: Add CloudControllerManager Cap for
v416, 2024-03-27, #49708), because [1] explains:

  disabling CloudControllerManager is only supported on the Baremetal, None, or External platform with cloudControllerManager value none

Besides the release periodics, I'm also touching the cluster-bot job
definitions in openshift-release-infra-periodics.yaml.  AWS, Azure,
and GCP will all need this new capability.  I'm not clear on the
packet-assisted job from 6544a41 (periodics: add assisted launch
job, 2024-02-12, #48700), and I cannot figure out the Cluster Bot
launch syntax to trigger that path.  So for now, I'm adding the new
capability there too, to avoid forking the configuration without a
clearer understanding of the context.

This change will break these Cluster Bot jobs for 4.15 and earlier,
where the new capability does not exist or match the ClusterVersion
enum.  But they're already generally available, so folks may not need
access, and if they do, hackery like 428ef75
(ci-operator/jobs/openshift/release/openshift-release-infra-periodics:
Temporarily drop MachineAPI from Azure Cluster Bot job, 2023-10-23,
#44751) can restore it.

[1]: openshift/installer@2dc1ef8
saifshaikh48 pushed a commit to saifshaikh48/release that referenced this pull request Apr 23, 2024
…er to "no-capabilities" (openshift#51070)

Similar to bbb31f9 (OCPQE-19978: Add CloudControllerManager Cap for
v416, 2024-03-27, openshift#49708), because [1] explains:

  disabling CloudControllerManager is only supported on the Baremetal, None, or External platform with cloudControllerManager value none

Besides the release periodics, I'm also touching the cluster-bot job
definitions in openshift-release-infra-periodics.yaml.  AWS, Azure,
and GCP will all need this new capability.  I'm not clear on the
packet-assisted job from 6544a41 (periodics: add assisted launch
job, 2024-02-12, openshift#48700), and I cannot figure out the Cluster Bot
launch syntax to trigger that path.  So for now, I'm adding the new
capability there too, to avoid forking the configuration without a
clearer understanding of the context.

This change will break these Cluster Bot jobs for 4.15 and earlier,
where the new capability does not exist or match the ClusterVersion
enum.  But they're already generally available, so folks may not need
access, and if they do, hackery like 428ef75
(ci-operator/jobs/openshift/release/openshift-release-infra-periodics:
Temporarily drop MachineAPI from Azure Cluster Bot job, 2023-10-23,
openshift#44751) can restore it.

[1]: openshift/installer@2dc1ef8
BradLugo pushed a commit to BradLugo/openshift-release that referenced this pull request Jun 13, 2024
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.

9 participants