Skip to content

chore(e2e): retries for bulk import test - #3367

Merged
openshift-merge-bot[bot] merged 6 commits into
redhat-developer:mainfrom
zdrapela:retries-filter
Sep 5, 2025
Merged

chore(e2e): retries for bulk import test#3367
openshift-merge-bot[bot] merged 6 commits into
redhat-developer:mainfrom
zdrapela:retries-filter

Conversation

@zdrapela

@zdrapela zdrapela commented Sep 5, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Description

The bulk import test was using a manually defined GitHub repository, which caused issues with retries. Now they are defined dynamically so that retries are allowed. That should lead to a higher success rate with Bulk Import tests.

Which issue(s) does this PR fix

PR acceptance criteria

Please make sure that the following steps are complete:

  • GitHub Actions are completed and successful
  • Unit Tests are updated and passing
  • E2E Tests are updated and passing
  • Documentation is updated if necessary (requirement for new features)
  • Add a screenshot if the change is UX/UI related

How to test changes / Special notes to the reviewer

@openshift-ci

openshift-ci Bot commented Sep 5, 2025

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@zdrapela

zdrapela commented Sep 5, 2025

Copy link
Copy Markdown
Member Author

/test e2e-tests

@github-actions

github-actions Bot commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

The image is available at:

@zdrapela

zdrapela commented Sep 5, 2025

Copy link
Copy Markdown
Member Author

/test e2e-tests

@zdrapela zdrapela changed the title chore(e2e): retries for repo filtering chore(e2e): retries for bulk import test Sep 5, 2025
@zdrapela
zdrapela marked this pull request as ready for review September 5, 2025 12:05
@openshift-ci
openshift-ci Bot requested a review from albarbaro September 5, 2025 12:05
@subhashkhileri

subhashkhileri commented Sep 5, 2025

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Sep 5, 2025
@openshift-ci

openshift-ci Bot commented Sep 5, 2025

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: subhashkhileri

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

The pull request process is described here

Details 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 label Sep 5, 2025
@zdrapela

zdrapela commented Sep 5, 2025

Copy link
Copy Markdown
Member Author

/cherry-pick release-1.6

@openshift-cherrypick-robot

openshift-cherrypick-robot commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

@zdrapela: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.6

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.

@zdrapela

zdrapela commented Sep 5, 2025

Copy link
Copy Markdown
Member Author

/cherry-pick release-1.7

@openshift-cherrypick-robot

openshift-cherrypick-robot commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

@zdrapela: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.7

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 045656d into redhat-developer:main Sep 5, 2025
26 checks passed
@openshift-cherrypick-robot

openshift-cherrypick-robot commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

@zdrapela: #3367 failed to apply on top of branch "release-1.6":

Applying: chore(e2e): retries for repo filtering
Using index info to reconstruct a base tree...
M	e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
M	e2e-tests/playwright/support/pages/bulk-import.ts
Falling back to patching base and 3-way merge...
Auto-merging e2e-tests/playwright/support/pages/bulk-import.ts
CONFLICT (content): Merge conflict in e2e-tests/playwright/support/pages/bulk-import.ts
Auto-merging e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore(e2e): retries for repo filtering
Details

In response to this:

/cherry-pick release-1.6

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-cherrypick-robot

openshift-cherrypick-robot commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

@zdrapela: #3367 failed to apply on top of branch "release-1.7":

Applying: chore(e2e): retries for repo filtering
Using index info to reconstruct a base tree...
M	e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
M	e2e-tests/playwright/support/pages/bulk-import.ts
Falling back to patching base and 3-way merge...
Auto-merging e2e-tests/playwright/support/pages/bulk-import.ts
Auto-merging e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
Applying: Skip if already added
Using index info to reconstruct a base tree...
M	e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
M	e2e-tests/playwright/support/pages/bulk-import.ts
M	e2e-tests/playwright/utils/ui-helper.ts
Falling back to patching base and 3-way merge...
Auto-merging e2e-tests/playwright/utils/ui-helper.ts
Auto-merging e2e-tests/playwright/support/pages/bulk-import.ts
Auto-merging e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
Applying: Logging
Applying: Revert
Applying: Dynamically create the repository
Using index info to reconstruct a base tree...
M	e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
Falling back to patching base and 3-way merge...
Auto-merging e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
CONFLICT (content): Merge conflict in e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0005 Dynamically create the repository
Details

In response to this:

/cherry-pick release-1.7

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.

zdrapela added a commit to zdrapela/rhdh that referenced this pull request Sep 8, 2025
@zdrapela
chore(e2e): retries for bulk import test (redhat-developer#3367)
45e688a 
* chore(e2e): retries for repo filtering

* Skip if already added

* Logging

* Revert

* Dynamically create the repository

* Update bulk-import.spec.ts
zdrapela added a commit to zdrapela/rhdh that referenced this pull request Sep 8, 2025
@zdrapela
chore(e2e): retries for bulk import test (redhat-developer#3367)
0ec98c6 
* chore(e2e): retries for repo filtering

* Skip if already added

* Logging

* Revert

* Dynamically create the repository

* Update bulk-import.spec.ts
openshift-merge-bot Bot pushed a commit that referenced this pull request Sep 9, 2025
@zdrapela
chore(cherry-pick): eslint, attributes, fixes (#3380)
a770c88 
* chore(e2e): fix e2e-tests linter and establish linter check (#3332)

* chore(fix): e2e-tests linter

Assisted-by: Cursor

* fixed by Prettier

* Manual fix

Assisted-by: Cursor

* Fix adoption insights

* Create e2e-tests-lint.yaml

* chore(ci): use nounset for CI scripts (#3340)

* chore(ci): use nounset for CI scripts

* Fix sanity checks

* Refactor openshift-ci-tests

* Refactor cleanup

* chore(e2e): attributes for junit (#3333)

* Detect platform and save

* add reportportal/agent-js-playwright

* playwright install chromium

* authentication

* Apply attributes

Assisted-by: Cursor

* Cherry-pick linter

* ok

* Move attributes to beforeall

* Fix junit output definition

* Keep properties

* Fix artifacts url

* JUnit for rehearsals

* Note about GNU grep and GNU sed

Update README.md

* Remove irelevant helper function

* fix artifacts URL for PRs

* tag next

* JOB_TYPE="periodic"

* remove periodic

* Adapt junit file and backup

* Fix

* Fix to use annotations

* Revert "add reportportal/agent-js-playwright"

This reverts commit fa2a088.

* Cursor rule for component assignment

* chore(ci): fix k8s sourcing (#3350)

* chore(e2e): retries for bulk import test (#3367)

* chore(e2e): retries for repo filtering

* Skip if already added

* Logging

* Revert

* Dynamically create the repository

* Update bulk-import.spec.ts

* Update e2e-tests-lint.yaml

* Fix analytics

* tsc

* Update e2e-tests-lint.yaml

* Fix

* Fix chart

* Update utils.sh

* Revert "Update utils.sh"

This reverts commit 2e334dc.

* Fix sanity
guyoron1 pushed a commit to guyoron1/rhdh that referenced this pull request Sep 29, 2025
@zdrapela @guyoron1
chore(e2e): retries for bulk import test (redhat-developer#3367)
c6f246a 
* chore(e2e): retries for repo filtering

* Skip if already added

* Logging

* Revert

* Dynamically create the repository

* Update bulk-import.spec.ts
@rhdh-qodo-merge rhdh-qodo-merge Bot mentioned this pull request Apr 16, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@subhashkhileri subhashkhileri Awaiting requested review from subhashkhileri
@albarbaro albarbaro Awaiting requested review from albarbaro

Assignees

@subhashkhileri subhashkhileri

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@zdrapela @subhashkhileri @openshift-cherrypick-robot