From 481596f5e5d129b2c35c9fb83c0218c105e93f4c Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Wed, 1 Apr 2020 13:32:26 -0400 Subject: [PATCH] Bug 1785023: Restore ResourceQuota e2e test for life of a secret This reverts commit adc358016eb4ed8d539c448f829869fa63135964, reversing changes made to 4db88247520a1467b09b41ea8ce0301a45a54b36 in openshift/origin#24754 --- .../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 abb409b2b25c..bcd3f6bf1d57 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 2cdfb8737db8..1e73dedef0b2 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`, },