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.

Sign up for GitHub

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

Jump to bottom

Fix win acceptance tests - 3.21.x #5325

Merged
merged 4 commits into from
Sep 19, 2023
Merged

Fix win acceptance tests - 3.21.x #5325

merged 4 commits into from
Sep 19, 2023

Conversation

Lex-2008
Copy link
Contributor

@Lex-2008 Lex-2008 commented Sep 15, 2023 •
edited
Loading

Ticket: ENT-10470

merge together: cfengine/buildscripts#1289

Aleksei Shpakovskii added 3 commits September 15, 2023 14:40
Amend acceptance tests for testsuite to pass on Windows
2787622 
For now, majority of tests are marked as soft-fail (a failure is expected).

Follow-up tasks are created (and linked) to investigate these failures
one-by-one.

Changelog: none

Ticket: ENT-2664
(cherry picked from commit 895c3ca)
un-soft-fail passing tests
b270937 
After removing .gitattributes file, some tests started passing

Ticket: ENT-10254

Changelog: none
(cherry picked from commit 1c93e72)
Convert win lineendings to Unix for tests which need it on Windows
eb5c801 
Ticket: ENT-10433

Changelog: none
(cherry picked from commit 9a9d10d)
@Lex-2008 Lex-2008 added the WIP Work in Progress label Sep 15, 2023
Change suppress fail to soft fail on known failing tests
0759205 
Ticket: ENT-10470

Issue was that these failures were visible in Jenkins,
turning build "unstable".

(cherry picked from commit 3d88073)
@Lex-2008 Lex-2008 marked this pull request as ready for review September 18, 2023 16:45
@Lex-2008 Lex-2008 mentioned this pull request Sep 18, 2023
Merged
@Lex-2008 Lex-2008 removed the WIP Work in Progress label Sep 18, 2023
@Lex-2008
Copy link
Contributor Author

🟢 build: https://ci.cfengine.com/job/pr-pipeline/9851/

olehermanse
olehermanse approved these changes Sep 18, 2023
View reviewed changes
Copy link
Member

@olehermanse olehermanse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good in general. I like the references to ticket numbers. The PR description could use a reference to which PR(s) you are backporting and what the differences were. (In this case it looks like you didn't have to backport the .gitattributes removal).

craigcomstock
craigcomstock approved these changes Sep 18, 2023
View reviewed changes
Copy link
Contributor

@craigcomstock craigcomstock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool!

@nickanderson nickanderson merged commit 3f6dd0c into cfengine:3.21.x Sep 19, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@craigcomstock craigcomstock craigcomstock approved these changes

@olehermanse olehermanse olehermanse approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Lex-2008 @craigcomstock @olehermanse @nickanderson