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

Fix password validation tests #3784

Merged
merged 2 commits into from
May 24, 2023
Merged

Fix password validation tests #3784

merged 2 commits into from
May 24, 2023

Conversation

tschorr
Copy link
Contributor

@tschorr tschorr commented May 23, 2023

Fix tests failing because of plone/Products.PlonePAS#75, merge after that PR.

@tschorr tschorr self-assigned this May 23, 2023
@mister-roboto
Copy link

@tschorr thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

@tschorr tschorr marked this pull request as draft May 23, 2023 11:32
@tschorr tschorr requested review from davisagli and jensens May 23, 2023 11:35
@tschorr tschorr marked this pull request as ready for review May 23, 2023 11:46
@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

@jenkins-plone-org please run jobs

@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

Failure in pull-request-6.1-3.11 looks unrelated.

@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

@jenkins-plone-org please run jobs

@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

This time pull-request-6.1-3.11 has passed, but it looks like the remaining Jenkins jobs are not started for some reason. Jenkins build queue is empty ...(?)

@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

@jenkins-plone-org please run jobs

@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

I'm stuck here. The pull-request-6.0-3.x Jenkins jobs never start (Jenkins build queue is empty), but they are required to run before I can merge the PR. @gforcada @davisagli any ideas?

@davisagli davisagli merged commit a5b48c0 into master May 24, 2023
@davisagli davisagli deleted the tschorr_fix_error_msg branch May 24, 2023 14:31
@davisagli
Copy link
Sponsor Member

@tschorr I think I understand: this is targeting the master branch of CMFPlone, which is only used for Plone 6.1, so it is correct that it only triggers the builds for 6.1. However, the branch protection rules were not updated, so github was still expecting builds to run for 6.0. I just updated the branch protection rules so that only the Plone 6.1 job is required.

Since the change in PlonePAS is on a branch which is still used by both Ploen 6.0 and Plone 6.1, we also need this test fix in the 6.0.x branch of CMFPlone.

davisagli pushed a commit that referenced this pull request May 24, 2023
* fix test

* update changelog
@davisagli
Copy link
Sponsor Member

@tschorr I submitted the backport in #3788

davisagli added a commit that referenced this pull request May 24, 2023
* fix test

* update changelog

Co-authored-by: Thomas Schorr <t_schorr@gmx.de>
@tschorr
Copy link
Contributor Author

tschorr commented May 24, 2023

@tschorr I think I understand: this is targeting the master branch of CMFPlone, which is only used for Plone 6.1, so it is correct that it only triggers the builds for 6.1. However, the branch protection rules were not updated, so github was still expecting builds to run for 6.0. I just updated the branch protection rules so that only the Plone 6.1 job is required.

Since the change in PlonePAS is on a branch which is still used by both Ploen 6.0 and Plone 6.1, we also need this test fix in the 6.0.x branch of CMFPlone.

@davisagli thanks for sorting this out. I think I didn't see any differences between master and 6.0x when I created this PR and I didn't know that the master branch is only used for Plone 6.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants