diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml index 03bb5a40366be..c0cdecc5713b2 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml @@ -379,7 +379,7 @@ tests: steps: cluster_profile: aws-qe env: - ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI + ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential BASE_DOMAIN: qe.devcluster.openshift.com BASELINE_CAPABILITY_SET: None E2E_RUN_TAGS: '@amd64 and @aws-ipi and @disconnected and @network-ovnkubernetes @@ -396,7 +396,7 @@ tests: steps: cluster_profile: aws-qe env: - ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI + ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential BASE_DOMAIN: qe.devcluster.openshift.com BASELINE_CAPABILITY_SET: None E2E_RUN_TAGS: '@amd64 and @aws-ipi and @disconnected and @network-ovnkubernetes diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__arm64-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__arm64-nightly.yaml index 5e2f9bb94d716..81cceb9b1c516 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__arm64-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__arm64-nightly.yaml @@ -224,7 +224,7 @@ tests: dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: - ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI + ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential BASE_DOMAIN: qe.devcluster.openshift.com BASELINE_CAPABILITY_SET: None COMPUTE_NODE_TYPE: m6g.xlarge @@ -246,7 +246,7 @@ tests: dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: - ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI + ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential BASE_DOMAIN: qe.devcluster.openshift.com BASELINE_CAPABILITY_SET: None COMPUTE_NODE_TYPE: m6g.xlarge diff --git a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly.yaml b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly.yaml index 8176b6eab4088..f06338dabedf0 100644 --- a/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly.yaml +++ b/ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly.yaml @@ -323,6 +323,7 @@ tests: dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: + ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential BASE_DOMAIN: qe.devcluster.openshift.com BASELINE_CAPABILITY_SET: None E2E_RUN_TAGS: '@amd64 and @aws-upi and @network-ovnkubernetes and not @fips @@ -339,6 +340,7 @@ tests: dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: + ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential BASE_DOMAIN: qe.devcluster.openshift.com BASELINE_CAPABILITY_SET: None BOOTSTRAP_INSTANCE_TYPE: m6g.large @@ -428,6 +430,7 @@ tests: dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: + ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential BASE_DOMAIN: qe.azure.devcluster.openshift.com E2E_RUN_TAGS: '@amd64 and @azure-ipi and @network-ovnkubernetes and not @fips and not @workloads' @@ -443,6 +446,7 @@ tests: dependencies: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest env: + ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential BASE_DOMAIN: qe.azure.devcluster.openshift.com COMPUTE_NODE_TYPE: Standard_D4ps_v5 E2E_RUN_TAGS: '@arm64 and @azure-ipi and @network-ovnkubernetes and not @fips diff --git a/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh b/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh index f166e5a5f3df3..4a7dbc0217848 100644 --- a/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh +++ b/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh @@ -87,6 +87,7 @@ caps_operator[NodeTuning]="node-tuning" caps_operator[MachineAPI]="machine-api control-plane-machine-set cluster-autoscaler" caps_operator[ImageRegistry]="image-registry" caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lifecycle-manager-catalog operator-lifecycle-manager-packageserver" +caps_operator[CloudCredential]="cloud-credential" # Mapping between optional capability and resources # Need to be updated when new resource marks as optional @@ -100,7 +101,7 @@ v411="baremetal marketplace openshift-samples" v412=" ${v411} Console Insights Storage CSISnapshot" v413=" ${v412} NodeTuning" v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" -v415=" ${v414} OperatorLifecycleManager" +v415=" ${v414} OperatorLifecycleManager CloudCredential" latest_defined="v415" always_default="${!latest_defined}" diff --git a/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh b/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh index 0cd7487ef431d..f8245da8928a0 100644 --- a/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh +++ b/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh @@ -68,10 +68,10 @@ function get_caps_for_version_capset() { caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry" ;; "v4.15") - caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager" + caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential" ;; *) - caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager" + caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential" ;; esac @@ -267,6 +267,7 @@ caps_operator[NodeTuning]="node-tuning" caps_operator[MachineAPI]="machine-api control-plane-machine-set cluster-autoscaler" caps_operator[ImageRegistry]="image-registry" caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lifecycle-manager-catalog operator-lifecycle-manager-packageserver" +caps_operator[CloudCredential]="cloud-credential" # Mapping between optional capability and resources # Need update when new resource marks as optional diff --git a/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh b/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh index 6c821f4866ff3..38982a53d97e5 100644 --- a/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh +++ b/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh @@ -63,7 +63,7 @@ v413=" ${v412} NodeTuning" # shellcheck disable=SC2034 v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" # shellcheck disable=SC2034 -v415=" ${v414} OperatorLifecycleManager" +v415=" ${v414} OperatorLifecycleManager CloudCredential" latest_version="v415" declare "v${ocp_major_version}${ocp_minor_version}" @@ -86,17 +86,27 @@ selected_capability="${vcurrent_capabilities_array[$selected_capability_index]}" echo "Selected capability to be disabled: ${selected_capability}" enabled_capabilities=${vcurrent_capabilities} -if [[ ! "${selected_capability}" == "MachineAPI" ]]; then - enabled_capabilities=${enabled_capabilities/${selected_capability}} -else +case "${selected_capability}" in +"MachineAPI") echo "WARNING: MachineAPI is selected, but it requires on IPI, so no capability to be disabled!" -fi - + ;; +# To be updated once OCP 4.16 is released +"CloudCredential") + if [[ "${CLUSTER_TYPE}" =~ ^packet.*$|^equinix.*$ ]]; then + enabled_capabilities=${enabled_capabilities/${selected_capability}} + else + echo "WARNING: non-BareMetal platforms require CCO for OCP 4.15, so no capability to be disabled!" + fi + ;; # Disable marketplace if OperatorLifecycleManager is selected to bo disabled -if [[ "${selected_capability}" == "OperatorLifecycleManager" ]]; then +"OperatorLifecycleManager") echo "Capability 'marketplace' depends on Capability 'OperatorLifecycleManager', so disable marketplace along with OperatorLifecycleManager" + enabled_capabilities=${enabled_capabilities/${selected_capability}} enabled_capabilities=${enabled_capabilities/"marketplace"} -fi + ;; +*) + enabled_capabilities=${enabled_capabilities/${selected_capability}} +esac # apply patch to install-config CONFIG="${SHARED_DIR}/install-config.yaml" diff --git a/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh b/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh index c524e0a69d0a6..9b7c41a24de8c 100755 --- a/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh +++ b/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh @@ -58,7 +58,7 @@ v411="baremetal marketplace openshift-samples" v412=" ${v411} Console Insights Storage CSISnapshot" v413=" ${v412} NodeTuning" v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" -v415=" ${v414} OperatorLifecycleManager" +v415=" ${v414} OperatorLifecycleManager CloudCredential" latest_defined="v415" always_default="${!latest_defined}"