Skip to content

Commit 2c44cf0

Browse files
authored
Merge pull request #18388 from deads2k/flake-01-quota
tolerate crq results up to the limit before selecting three namespaces
2 parents 04c8e5b + 7a73584 commit 2c44cf0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/cmd/quota.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ os::cmd::try_until_text 'oc get appliedclusterresourcequota -n quota-asmail --as
3232
# the point of the test is to make sure that clusterquota is counting correct and secrets are auto-created and countable
3333
# the create_dockercfg controller can issue multiple creates if the token controller doesn't fill them in, but the creates are duplicates
3434
# since an annotation tracks the intended secrets to be created. That results in multi-counting quota until reconciliation runs
35-
os::cmd::try_until_text 'oc get secrets -o name --all-namespaces; oc describe appliedclusterresourcequota/for-deads-by-annotation -n quota-bar --as deads' "secrets.*(1[0-9]|20|21|22)"
35+
# do not go past 26. If you get to 27, you might be selecting an extra namespace.
36+
os::cmd::try_until_text 'oc get secrets -o name --all-namespaces; oc describe appliedclusterresourcequota/for-deads-by-annotation -n quota-bar --as deads' "secrets.*(1[0-9]|20|21|22|23|24|25|26)"
3637
os::cmd::expect_success 'oc delete project quota-foo'
3738
os::cmd::try_until_not_text 'oc get clusterresourcequota/for-deads-by-annotation -o jsonpath="{.status.namespaces[*].namespace}"' 'quota-foo'
3839
os::cmd::expect_success 'oc delete project quota-bar'

0 commit comments

Comments
 (0)