Skip to content

Commit 6dcf2ca

Browse files
committed
test-ext: enable test-extension cases for CI
1 parent e338ba6 commit 6dcf2ca

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

cmd/cloud-credential-tests-ext/main.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func registerSuites(ext *e.Extension) {
5252
"openshift/conformance/parallel",
5353
},
5454
Qualifiers: []string{
55-
`name.contains("[Level0]") && !(name.contains("[Serial]") || name.contains("[Disruptive]"))`,
55+
`(name.contains("[Level0]") || name.contains("[Suite:cco/conformance/parallel]")) && !(name.contains("[Serial]") || name.contains("[Disruptive]"))`,
5656
},
5757
},
5858
{
@@ -61,14 +61,21 @@ func registerSuites(ext *e.Extension) {
6161
"openshift/conformance/serial",
6262
},
6363
Qualifiers: []string{
64-
`name.contains("[Serial]") && !name.contains("[Disruptive]")`,
64+
`name.contains("[Serial]") && !name.contains("[Disruptive]") && !name.contains("[Slow]")`,
6565
},
6666
},
6767
{
6868
Name: "cco/disruptive",
6969
Parents: []string{"openshift/disruptive"},
7070
Qualifiers: []string{
71-
`name.contains("[Disruptive]")`,
71+
`name.contains("[Disruptive]") && !name.contains("[Slow]")`,
72+
},
73+
},
74+
{
75+
Name: "cco/slow",
76+
Parents: []string{"openshift/optional/slow"},
77+
Qualifiers: []string{
78+
`name.contains("[Slow]")`,
7279
},
7380
},
7481
{

test/extend/cloudcredential.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var _ = g.Describe("[Jira:\"Cloud Credential Operator\"] Cluster_Operator CCO is
6060

6161
// It is destructive case, will remove root credentials, so adding [Disruptive]. The case duration is greater than 5 minutes
6262
// so adding [Slow]
63-
g.It("[Suite:cco/disruptive][OTP][PolarionID:31768][Disruptive][Serial][Slow]NonHyperShiftHOST-High-Report the mode of cloud-credential operation as a metric", ote.Informing(), func() {
63+
g.It("[Suite:cco/disruptive][OTP][PolarionID:31768][Disruptive][Slow]NonHyperShiftHOST-High-Report the mode of cloud-credential operation as a metric", ote.Informing(), func() {
6464
iaasPlatform, err := getIaasPlatform(oc)
6565
o.Expect(err).NotTo(o.HaveOccurred())
6666

@@ -160,7 +160,7 @@ spec:
160160

161161
//For bug https://bugzilla.redhat.com/show_bug.cgi?id=1940142
162162
//For bug https://bugzilla.redhat.com/show_bug.cgi?id=1952891
163-
g.It("[Suite:cco/disruptive][OTP][PolarionID:45415][Level0][Disruptive][Serial][platform:openstack] NonHyperShiftHOST-High-[Bug 1940142] Reset CACert to correct path", ote.Informing(), func() {
163+
g.It("[Suite:cco/disruptive][OTP][PolarionID:45415][Disruptive][platform:openstack] NonHyperShiftHOST-High-[Bug 1940142] Reset CACert to correct path", ote.Informing(), func() {
164164
g.By("Check if it's an osp cluster")
165165
skipIfPlatformTypeNot(oc, "openstack")
166166
g.By("Get openstack root credential clouds.yaml field")
@@ -334,7 +334,7 @@ data:
334334
}
335335
})
336336

337-
g.It("[Suite:cco/disruptive][OTP][PolarionID:48360][Disruptive][Serial][platform:aws] NonHyperShiftHOST-Medium-Reconciliation of aws pod identity mutating webhook did not happen", ote.Informing(), func() {
337+
g.It("[Suite:cco/disruptive][OTP][PolarionID:48360][Disruptive][platform:aws] NonHyperShiftHOST-Medium-Reconciliation of aws pod identity mutating webhook did not happen", ote.Informing(), func() {
338338
//Check IAAS platform type
339339
iaasPlatform := checkPlatform(oc)
340340
if iaasPlatform != "aws" {
@@ -373,7 +373,7 @@ data:
373373
assertWaitPollNoErr(errWait, "The port is not reset to 443")
374374
})
375375

376-
g.It("[Suite:cco/disruptive][OTP][PolarionID:45975][Disruptive][Serial] NonHyperShiftHOST-Medium-Test cco condition changes", ote.Informing(), func() {
376+
g.It("[Suite:cco/disruptive][OTP][PolarionID:45975][Disruptive] NonHyperShiftHOST-Medium-Test cco condition changes", ote.Informing(), func() {
377377
//Check CCO mode
378378
mode, err := getCloudCredentialMode(oc)
379379
o.Expect(err).NotTo(o.HaveOccurred())
@@ -513,7 +513,7 @@ data:
513513
o.Expect(strings.Contains(doOcpReq(oc, "get", true, "secrets", "-n", OpenShiftImageRegistryNamespace, InstallerCloudCredentialsSecretName, "-o=jsonpath={.data}"), "azure_federated_token_file")).Should(o.BeTrue())
514514
})
515515

516-
g.It("[Suite:cco/conformance/parallel][OTP][PolarionID:64885][platform:aws] NonHyperShiftHOST-OSD_CCS-ARO-Critical-CCO-based flow for olm managed operators and AWS STS", ote.Informing(), func() {
516+
g.It("[Suite:cco/conformance/parallel][OTP][PolarionID:64885][platform:aws] Critical-CCO-based flow for olm managed operators and AWS STS", ote.Informing(), func() {
517517
skipIfPlatformTypeNot(oc, "aws")
518518
if !isSTSCluster(oc) {
519519
g.Skip("This test case is AWS STS only, skipping")

0 commit comments

Comments
 (0)