From 2d81ab8ca78ee736dbf3909f991c6a13d7a0888b Mon Sep 17 00:00:00 2001 From: Danil-Grigorev Date: Thu, 29 Jul 2021 17:10:00 +0200 Subject: [PATCH] Make sure TPNU or CustomNoUpgrade FG does not affect test results Either TPNU or CustomNoUpgrade results in alerts firing in e2e tests, however it is expected in CCM use-case and should not make the test fail. - `Managed cluster should start all core operators` - kube-api-server operator has a specific alert, notifying the cluster is non-upgradable with TP or CNU featureGates. This outputs: ``` Upgradeable=False FeatureGates_RestrictedFeatureGates_CustomNoUpgrade: FeatureGatesUpgradeable: "CustomNoUpgrade" does not allow updates ``` marking operator non-healthy in e2e tests. This is not critical and is expected in successfull job pass. --- .../ccm/install/openshift-e2e-aws-ccm-install-workflow.yaml | 4 ++++ .../ccm/install/openshift-e2e-azure-ccm-install-workflow.yaml | 4 ++++ .../e2e/azure/ccm/openshift-e2e-azure-ccm-workflow.yaml | 4 ++++ .../openstack/ccm/openshift-e2e-openstack-ccm-workflow.yaml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/ci-operator/step-registry/openshift/e2e/aws/ccm/install/openshift-e2e-aws-ccm-install-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/ccm/install/openshift-e2e-aws-ccm-install-workflow.yaml index 0d17520ab29f9..29de6c5711ef9 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/ccm/install/openshift-e2e-aws-ccm-install-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/ccm/install/openshift-e2e-aws-ccm-install-workflow.yaml @@ -13,5 +13,9 @@ workflow: - chain: ipi-aws-post env: TEST_CSI_DRIVER_MANIFEST: manifest-aws-ebs.yaml + TEST_SKIPS: >- + Managed cluster should start all core operators\| + Alerts shouldn't report any alerts in firing or pending state\| + Prometheus when installed on the cluster shouldn't report any alerts in firing state apart from Watchdog and AlertmanagerReceiversNotConfigured documentation: |- The Openshift E2E AWS CCM install workflow executes the common end-to-end test suite on AWS with a cluster configuration including CCM pods diff --git a/ci-operator/step-registry/openshift/e2e/azure/ccm/install/openshift-e2e-azure-ccm-install-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azure/ccm/install/openshift-e2e-azure-ccm-install-workflow.yaml index 4a805a72fdd80..de1a695c61509 100644 --- a/ci-operator/step-registry/openshift/e2e/azure/ccm/install/openshift-e2e-azure-ccm-install-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/azure/ccm/install/openshift-e2e-azure-ccm-install-workflow.yaml @@ -12,5 +12,9 @@ workflow: - chain: ipi-azure-post env: TEST_CSI_DRIVER_MANIFEST: manifest-aws-ebs.yaml + TEST_SKIPS: >- + Managed cluster should start all core operators\| + Alerts shouldn't report any alerts in firing or pending state\| + Prometheus when installed on the cluster shouldn't report any alerts in firing state apart from Watchdog and AlertmanagerReceiversNotConfigured documentation: |- The Openshift E2E Azure CCM install workflow executes the common end-to-end test suite on Azure with a cluster configuration including CCM pods diff --git a/ci-operator/step-registry/openshift/e2e/azure/ccm/openshift-e2e-azure-ccm-workflow.yaml b/ci-operator/step-registry/openshift/e2e/azure/ccm/openshift-e2e-azure-ccm-workflow.yaml index b6850779a23fe..85bd2af583a35 100644 --- a/ci-operator/step-registry/openshift/e2e/azure/ccm/openshift-e2e-azure-ccm-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/azure/ccm/openshift-e2e-azure-ccm-workflow.yaml @@ -17,6 +17,10 @@ workflow: CLUSTERCSIDRIVER: disk.csi.azure.com TRUECONDITIONS: AzureDiskDriverControllerServiceControllerAvailable AzureDiskDriverNodeServiceControllerAvailable TEST_CSI_DRIVER_MANIFEST: manifest-azure-disk.yaml + TEST_SKIPS: >- + Managed cluster should start all core operators\| + Alerts shouldn't report any alerts in firing or pending state\| + Prometheus when installed on the cluster shouldn't report any alerts in firing state apart from Watchdog and AlertmanagerReceiversNotConfigured documentation: |- The Openshift E2E Azure workflow using CCM as a primary mean to initialize nodes. Executes the common end-to-end test suite on Azure to test updated cluster configuration. diff --git a/ci-operator/step-registry/openshift/e2e/openstack/ccm/openshift-e2e-openstack-ccm-workflow.yaml b/ci-operator/step-registry/openshift/e2e/openstack/ccm/openshift-e2e-openstack-ccm-workflow.yaml index 9e3c911fb6604..6fd236f9e18d7 100644 --- a/ci-operator/step-registry/openshift/e2e/openstack/ccm/openshift-e2e-openstack-ccm-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/openstack/ccm/openshift-e2e-openstack-ccm-workflow.yaml @@ -11,6 +11,10 @@ workflow: env: CONFIG_TYPE: "minimal" BASE_DOMAIN: shiftstack.devcluster.openshift.com + TEST_SKIPS: >- + Managed cluster should start all core operators\| + Alerts shouldn't report any alerts in firing or pending state\| + Prometheus when installed on the cluster shouldn't report any alerts in firing state apart from Watchdog and AlertmanagerReceiversNotConfigured documentation: |- The openshift-e2e-openstack-ipi workflow executes the common end-to-end test suite on OpenShift ipi intallation on OpenStack