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

chore(ci): refactor hardcoded backstage-showcase in e2e tests #2172

Conversation

zdrapela
Copy link
Member

@zdrapela zdrapela commented Jan 13, 2025

Description

Refactor e2e tests that use hardcoded janus-idp/backstage-showcase => redhat-developer/rhdh (folders, yaml references etc.)

I kept the references to quay.io/janus-idp/backstage-showcase.

This fixes this error caused by having hardcoded variables and the repo migration:

cp: cannot stat '/tmp/backstage-showcase/e2e-tests/test-results/*': No such file or directory

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

Copy link

openshift-ci bot commented Jan 13, 2025

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
Copy link
Member Author

/test all

Copy link
Contributor

@zdrapela
Copy link
Member Author

/test e2e-tests

@zdrapela
Copy link
Member Author

/test e2e-tests

Copy link
Contributor

@zdrapela zdrapela marked this pull request as ready for review January 13, 2025 12:59
@openshift-ci openshift-ci bot requested review from josephca and psrna January 13, 2025 12:59
@josephca
Copy link
Contributor

/lgtm
/approve

Copy link

openshift-ci bot commented Jan 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: josephca

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-merge-bot openshift-merge-bot bot merged commit 73d8bff into redhat-developer:main Jan 13, 2025
14 checks passed
@zdrapela
Copy link
Member Author

/cherry-pick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

@zdrapela: only redhat-developer org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

In response to this:

/cherry-pick release-1.4

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
Copy link
Member Author

/cherry-pick release-1.4

@zdrapela
Copy link
Member Author

/cherry-pick release-1.3

@openshift-cherrypick-robot
Copy link
Contributor

@zdrapela: #2172 failed to apply on top of branch "release-1.4":

Applying: chore(ci): refactor hardcoded backstage-showcase in e2e tests
Using index info to reconstruct a base tree...
M	.ibm/pipelines/resources/config_map/app-config-rhdh-rbac.yaml
M	.ibm/pipelines/resources/config_map/app-config-rhdh.yaml
A	.ibm/pipelines/resources/config_map/dynamic-homepage-and-sidebar-config.yaml
M	.ibm/pipelines/utils.sh
Falling back to patching base and 3-way merge...
Auto-merging .ibm/pipelines/utils.sh
CONFLICT (content): Merge conflict in .ibm/pipelines/utils.sh
CONFLICT (modify/delete): .ibm/pipelines/resources/config_map/dynamic-homepage-and-sidebar-config.yaml deleted in HEAD and modified in chore(ci): refactor hardcoded backstage-showcase in e2e tests. Version chore(ci): refactor hardcoded backstage-showcase in e2e tests of .ibm/pipelines/resources/config_map/dynamic-homepage-and-sidebar-config.yaml left in tree.
Auto-merging .ibm/pipelines/resources/config_map/app-config-rhdh.yaml
Auto-merging .ibm/pipelines/resources/config_map/app-config-rhdh-rbac.yaml
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(ci): refactor hardcoded backstage-showcase in e2e tests

In response to this:

/cherry-pick release-1.4

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
Copy link
Contributor

@zdrapela: #2172 failed to apply on top of branch "release-1.3":

Applying: chore(ci): refactor hardcoded backstage-showcase in e2e tests
Using index info to reconstruct a base tree...
A	.ibm/pipelines/resources/config_map/app-config-rhdh-rbac.yaml
A	.ibm/pipelines/resources/config_map/app-config-rhdh.yaml
A	.ibm/pipelines/resources/config_map/dynamic-homepage-and-sidebar-config.yaml
M	.ibm/pipelines/utils.sh
Falling back to patching base and 3-way merge...
Auto-merging .ibm/pipelines/utils.sh
CONFLICT (content): Merge conflict in .ibm/pipelines/utils.sh
CONFLICT (modify/delete): .ibm/pipelines/resources/config_map/dynamic-homepage-and-sidebar-config.yaml deleted in HEAD and modified in chore(ci): refactor hardcoded backstage-showcase in e2e tests. Version chore(ci): refactor hardcoded backstage-showcase in e2e tests of .ibm/pipelines/resources/config_map/dynamic-homepage-and-sidebar-config.yaml left in tree.
CONFLICT (modify/delete): .ibm/pipelines/resources/config_map/app-config-rhdh.yaml deleted in HEAD and modified in chore(ci): refactor hardcoded backstage-showcase in e2e tests. Version chore(ci): refactor hardcoded backstage-showcase in e2e tests of .ibm/pipelines/resources/config_map/app-config-rhdh.yaml left in tree.
CONFLICT (modify/delete): .ibm/pipelines/resources/config_map/app-config-rhdh-rbac.yaml deleted in HEAD and modified in chore(ci): refactor hardcoded backstage-showcase in e2e tests. Version chore(ci): refactor hardcoded backstage-showcase in e2e tests of .ibm/pipelines/resources/config_map/app-config-rhdh-rbac.yaml left in tree.
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(ci): refactor hardcoded backstage-showcase in e2e tests

In response to this:

/cherry-pick release-1.3

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.

@josephca
Copy link
Contributor

@zdrapela please refer to the comment: #2174 (comment)

Latest images are at https://quay.io/repository/rhdh-community/rhdh?tab=tags&tag=latest instead of in the janus-idp/backstage-showcase quay location. Please update accordingly.

Please open a new PR if required. Thanks!

kadel pushed a commit to kadel/backstage-showcase that referenced this pull request Jan 14, 2025
…-developer#2172)

* chore(ci): refactor hardcoded backstage-showcase in e2e tests

* Fix declaration

* Fix cp *
openshift-merge-bot bot pushed a commit that referenced this pull request Jan 15, 2025
…2174)

* chore(ci): refactor hardcoded backstage-showcase in e2e tests (#2172)

* Repo & image refactor

* image tag latest=>next

Co-authored-by: Nick Boldt <nboldt@redhat.com>

---------

Co-authored-by: Nick Boldt <nboldt@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants