From af791e9b76f528271ebb6b7c4e64c06504e20360 Mon Sep 17 00:00:00 2001 From: Michal Fojtik Date: Thu, 26 Mar 2020 16:10:47 +0100 Subject: [PATCH] Revert "tests: disable ResourceQuota e2e test for life of a secret" --- .../util/annotate/generated/zz_generated.annotations.go | 2 +- test/extended/util/annotate/rules.go | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 52955a7677c8..ee5cab80a8ac 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -208,7 +208,7 @@ var annotations = map[string]string{ "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a pod. [Conformance]": "should create a ResourceQuota and capture the life of a pod. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a replica set. [Conformance]": "should create a ResourceQuota and capture the life of a replica set. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a replication controller. [Conformance]": "should create a ResourceQuota and capture the life of a replication controller. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", - "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a secret. [Conformance]": "should create a ResourceQuota and capture the life of a secret. [Conformance] [Flaky] [Suite:k8s]", + "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a secret. [Conformance]": "should create a ResourceQuota and capture the life of a secret. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and capture the life of a service. [Conformance]": "should create a ResourceQuota and capture the life of a service. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", "[Top Level] [sig-api-machinery] ResourceQuota should create a ResourceQuota and ensure its status is promptly calculated. [Conformance]": "should create a ResourceQuota and ensure its status is promptly calculated. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", "[Top Level] [sig-api-machinery] ResourceQuota should verify ResourceQuota with best effort scope. [Conformance]": "should verify ResourceQuota with best effort scope. [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", diff --git a/test/extended/util/annotate/rules.go b/test/extended/util/annotate/rules.go index 7596d049f80b..cbaa3a015ce1 100644 --- a/test/extended/util/annotate/rules.go +++ b/test/extended/util/annotate/rules.go @@ -121,9 +121,6 @@ var ( `Job should run a job to completion when tasks sometimes fail and are not locally restarted`, // seems flaky, also may require too many resources `openshift mongodb replication creating from a template`, // flaking on deployment - // TODO(workloads): determine why the default secrets creation in a namespace take more than 30s - `create a ResourceQuota and capture the life of a secret`, // flaking on default secrets count in project - // TODO(node): test works when run alone, but not in the suite in CI `\[Feature:HPA\] Horizontal pod autoscaling \(scale resource: CPU\) \[sig-autoscaling\] ReplicationController light Should scale from 1 pod to 2 pods`, },