Skip to content

Conversation

kuiwang02
Copy link
Contributor

Summary

This PR enhances the test filtering capabilities in the tests-extension module to support additional test suites with more granular selection options.

Changes

  • Enhanced cmd/main.go: Extended the main command with improved filter logic and expanded functionality (75 lines of changes)
  • Added test/qe/util/filters/filters.go: New filtering module that provides enhanced test suite selection capabilities (60 lines of new code)

Benefits

  • More flexible test suite management
  • Improved test execution control
  • Better support for selective test running

Files Changed

  • tests-extension/cmd/main.go - Enhanced main command functionality
  • tests-extension/test/qe/util/filters/filters.go - New filtering utilities

Testing

./bin/olmv0-tests-ext list suites
[
  {
    "name": "olmv0/parallel",
    "description": "",
    "parents": [
      "openshift/conformance/parallel"
    ],
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))) \u0026\u0026 (!(name.contains(\"[Serial]\") || name.contains(\"[Slow]\")))))"
    ]
  },
  {
    "name": "olmv0/serial",
    "description": "",
    "parents": [
      "openshift/conformance/serial"
    ],
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))) \u0026\u0026 ((name.contains(\"[Serial]\") \u0026\u0026 !name.contains(\"[Disruptive]\") \u0026\u0026 !name.contains(\"[Slow]\")))))"
    ]
  },
  {
    "name": "olmv0/slow",
    "description": "",
    "parents": [
      "openshift/optional/slow"
    ],
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))) \u0026\u0026 (name.contains(\"[Slow]\"))))"
    ]
  },
  {
    "name": "olmv0/all",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))))"
    ]
  },
  {
    "name": "olmv0/extended",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\")))"
    ]
  },
  {
    "name": "olmv0/extended/releasegate",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\")))"
    ]
  },
  {
    "name": "olmv0/extended/candidate",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\")))"
    ]
  },
  {
    "name": "olmv1/extended/candidate/function",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")))"
    ]
  },
  {
    "name": "olmv0/extended/candidate/parallel",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 (!(name.contains(\"[Serial]\") || name.contains(\"[Slow]\")))))"
    ]
  },
  {
    "name": "olmv0/extended/candidate/serial",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 ((name.contains(\"[Serial]\") \u0026\u0026 !name.contains(\"[Slow]\")))))"
    ]
  },
  {
    "name": "olmv1/extended/candidate/fast",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 (!name.contains(\"[Slow]\"))))"
    ]
  },
  {
    "name": "olmv0/extended/candidate/slow",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 (name.contains(\"[Slow]\"))))"
    ]
  },
  {
    "name": "olmv0/extended/candidate/stress",
    "description": "",
    "qualifiers": [
      "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\")) \u0026\u0026 (labels.exists(l, l==\"StressTest\"))))"
    ]
  }
]

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 26, 2025

@kuiwang02: This pull request references OCPQE-29415 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Summary

This PR enhances the test filtering capabilities in the tests-extension module to support additional test suites with more granular selection options.

Changes

  • Enhanced cmd/main.go: Extended the main command with improved filter logic and expanded functionality (75 lines of changes)
  • Added test/qe/util/filters/filters.go: New filtering module that provides enhanced test suite selection capabilities (60 lines of new code)

Benefits

  • More flexible test suite management
  • Improved test execution control
  • Better support for selective test running

Files Changed

  • tests-extension/cmd/main.go - Enhanced main command functionality
  • tests-extension/test/qe/util/filters/filters.go - New filtering utilities

Testing

./bin/olmv0-tests-ext list suites
[
 {
   "name": "olmv0/parallel",
   "description": "",
   "parents": [
     "openshift/conformance/parallel"
   ],
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))) \u0026\u0026 (!(name.contains(\"[Serial]\") || name.contains(\"[Slow]\")))))"
   ]
 },
 {
   "name": "olmv0/serial",
   "description": "",
   "parents": [
     "openshift/conformance/serial"
   ],
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))) \u0026\u0026 ((name.contains(\"[Serial]\") \u0026\u0026 !name.contains(\"[Disruptive]\") \u0026\u0026 !name.contains(\"[Slow]\")))))"
   ]
 },
 {
   "name": "olmv0/slow",
   "description": "",
   "parents": [
     "openshift/optional/slow"
   ],
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))) \u0026\u0026 (name.contains(\"[Slow]\"))))"
   ]
 },
 {
   "name": "olmv0/all",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((!labels.exists(l, l==\"Extended\")) || (labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\"))))"
   ]
 },
 {
   "name": "olmv0/extended",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\")))"
   ]
 },
 {
   "name": "olmv0/extended/releasegate",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\") \u0026\u0026 labels.exists(l, l==\"ReleaseGate\")))"
   ]
 },
 {
   "name": "olmv0/extended/candidate",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\")))"
   ]
 },
 {
   "name": "olmv1/extended/candidate/function",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 ((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")))"
   ]
 },
 {
   "name": "olmv0/extended/candidate/parallel",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 (!(name.contains(\"[Serial]\") || name.contains(\"[Slow]\")))))"
   ]
 },
 {
   "name": "olmv0/extended/candidate/serial",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 ((name.contains(\"[Serial]\") \u0026\u0026 !name.contains(\"[Slow]\")))))"
   ]
 },
 {
   "name": "olmv1/extended/candidate/fast",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 (!name.contains(\"[Slow]\"))))"
   ]
 },
 {
   "name": "olmv0/extended/candidate/slow",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\") \u0026\u0026 !labels.exists(l, l==\"StressTest\")) \u0026\u0026 (name.contains(\"[Slow]\"))))"
   ]
 },
 {
   "name": "olmv0/extended/candidate/stress",
   "description": "",
   "qualifiers": [
     "(source == \"openshift:payload:olmv0\") \u0026\u0026 (((labels.exists(l, l==\"Extended\") \u0026\u0026 !labels.exists(l, l==\"ReleaseGate\")) \u0026\u0026 (labels.exists(l, l==\"StressTest\"))))"
   ]
 }
]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 26, 2025
@kuiwang02
Copy link
Contributor Author

/test e2e-gcp-olm-flaky

@kuiwang02
Copy link
Contributor Author

/test e2e-gcp-ovn

@kuiwang02
Copy link
Contributor Author

/test e2e-gcp-olm

@kuiwang02
Copy link
Contributor Author

/test okd-scos-e2e-aws-ovn

@jianzhangbjz
Copy link
Contributor

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 26, 2025
Copy link
Contributor

openshift-ci bot commented Sep 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianzhangbjz, kuiwang02

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 26, 2025
@kuiwang02
Copy link
Contributor Author

/verified by @kuiwang02

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 26, 2025
@openshift-ci-robot
Copy link

@kuiwang02: This PR has been marked as verified by @kuiwang02.

In response to this:

/verified by @kuiwang02

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0b07ab9 and 2 for PR HEAD b4b2caa in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0b07ab9 and 2 for PR HEAD b4b2caa in total

Copy link
Contributor

openshift-ci bot commented Sep 26, 2025

@kuiwang02: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-olm-flaky b4b2caa link false /test e2e-gcp-olm-flaky

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jianzhangbjz
Copy link
Contributor

/retest-required

@jianzhangbjz
Copy link
Contributor

/override ci/prow/e2e-gcp-olm

Copy link
Contributor

openshift-ci bot commented Sep 28, 2025

@jianzhangbjz: Overrode contexts on behalf of jianzhangbjz: ci/prow/e2e-gcp-olm

In response to this:

/override ci/prow/e2e-gcp-olm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot bot merged commit cad3ab4 into openshift:main Sep 28, 2025
15 of 16 checks passed
@kuiwang02 kuiwang02 deleted the enhancefilter branch September 28, 2025 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants