Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

USHIFT-2463: Add PreRunModifier flag to skip RF #3343

Merged
merged 4 commits into from
May 10, 2024

Conversation

agullon
Copy link
Contributor

@agullon agullon commented May 10, 2024

Closes Jira USHIFT-2463

Add --prerunmodifier flag to RF execution in run.sh to skip tests by name.

Example:
./test/run.sh -o /Users/agullon/workspace/microshift/_output/_output -i /Users/agullon/workspace/microshift/_output/rf_variables.yaml -k 'CLI Output,ConfigMap Matches CLI' -v /Users/agullon/workspace/microshift/_output/venv suites/standard1/version.robot

+ /Users/agullon/workspace/microshift/_output/venv/bin/robot --randomize all --prerunmodifier 'resources/SkipTests.py:CLI Output,ConfigMap Matches CLI' --loglevel TRACE -V /Users/agullon/workspace/microshift/_output/rf_variables.yaml -x junit.xml --outputdir /Users/agullon/workspace/microshift/_output/_output suites/standard1/version.robot
List of tests to be skipped:
 - CLI Output
 - ConfigMap Matches CLI
==============================================================================
Version :: Tests related to the version of MicroShift
==============================================================================
ConfigMap Contents :: Check the version of the server                 | PASS |
------------------------------------------------------------------------------
CLI Output :: Check the version reported by the process               | SKIP |
Test skipped using 'robot:skip' tag.
------------------------------------------------------------------------------
Metadata File Contents :: Ensure the metadata file contents match ... | PASS |
------------------------------------------------------------------------------
ConfigMap Matches CLI :: Ensure the ConfigMap is being updated bas... | SKIP |
Test skipped using 'robot:skip' tag.
------------------------------------------------------------------------------
Version :: Tests related to the version of MicroShift                 | PASS |
4 tests, 2 passed, 0 failed, 2 skipped
==============================================================================
Output:  /Users/agullon/workspace/microshift/_output/_output/output.xml
XUnit:   /Users/agullon/workspace/microshift/_output/_output/junit.xml
Log:     /Users/agullon/workspace/microshift/_output/_output/log.html
Report:  /Users/agullon/workspace/microshift/_output/_output/report.html
+ '[' '' ']'

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 10, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 10, 2024

@agullon: This pull request references USHIFT-2463 which is a valid jira issue.

In response to this:

Closes Jira USHIFT-2463

Add --prerunmodifier flag to RF execution in run.sh to skip tests by name.

Example:
./test/run.sh -o /Users/agullon/workspace/microshift/_output/_output -i /Users/agullon/workspace/microshift/_output/rf_variables.yaml -k 'CLI Output,ConfigMap Matches CLI' -v /Users/agullon/workspace/microshift/_output/venv suites/standard1/version.robot

+ /Users/agullon/workspace/microshift/_output/venv/bin/robot --randomize all --prerunmodifier 'resources/SkipTests.py:CLI Output,ConfigMap Matches CLI' --loglevel TRACE -V /Users/agullon/workspace/microshift/_output/rf_variables.yaml -x junit.xml --outputdir /Users/agullon/workspace/microshift/_output/_output suites/standard1/version.robot
List of tests to be skipped:
- CLI Output
- ConfigMap Matches CLI
==============================================================================
Version :: Tests related to the version of MicroShift
==============================================================================
ConfigMap Contents :: Check the version of the server                 | PASS |
------------------------------------------------------------------------------
CLI Output :: Check the version reported by the process               | SKIP |
Test skipped using 'robot:skip' tag.
------------------------------------------------------------------------------
Metadata File Contents :: Ensure the metadata file contents match ... | PASS |
------------------------------------------------------------------------------
ConfigMap Matches CLI :: Ensure the ConfigMap is being updated bas... | SKIP |
Test skipped using 'robot:skip' tag.
------------------------------------------------------------------------------
Version :: Tests related to the version of MicroShift                 | PASS |
4 tests, 2 passed, 0 failed, 2 skipped
==============================================================================
Output:  /Users/agullon/workspace/microshift/_output/_output/output.xml
XUnit:   /Users/agullon/workspace/microshift/_output/_output/junit.xml
Log:     /Users/agullon/workspace/microshift/_output/_output/log.html
Report:  /Users/agullon/workspace/microshift/_output/_output/report.html
+ '[' '' ']'

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 openshift-ci bot requested review from jogeo and pacevedom May 10, 2024 10:31
E999 SyntaxError: f-string expression part cannot include a backslash
test/run.sh Outdated Show resolved Hide resolved
test/run.sh Outdated Show resolved Hide resolved
@ggiguash
Copy link
Contributor

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 10, 2024
@ggiguash
Copy link
Contributor

/lgtm

Copy link
Contributor

openshift-ci bot commented May 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, ggiguash

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 lgtm Indicates that a PR is ready to be merged. label May 10, 2024
Copy link
Contributor

openshift-ci bot commented May 10, 2024

@agullon: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 5cf96a2 into openshift:main May 10, 2024
6 checks passed
@agullon
Copy link
Contributor Author

agullon commented Jun 19, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot

@agullon: #3343 failed to apply on top of branch "release-4.15":

Applying: Skip RF test with PreRunModifier flag
Using index info to reconstruct a base tree...
M	test/run.sh
Falling back to patching base and 3-way merge...
Auto-merging test/run.sh
CONFLICT (content): Merge conflict in test/run.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Skip RF test with PreRunModifier flag
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

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.

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants