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

CFE-3292: Removed soft fail related to the use of globs #5413

Merged
merged 9 commits into from
Feb 26, 2024
Merged

CFE-3292: Removed soft fail related to the use of globs #5413

merged 9 commits into from
Feb 26, 2024

Conversation

larsewi
Copy link
Contributor

@larsewi larsewi commented Jan 4, 2024 •
edited
Loading

Merge together:

TODO:

  • Manually test on Windows
  • Fix findfiles_up.cf acceptance test on windows

@larsewi larsewi mentioned this pull request Jan 4, 2024
Closed
@larsewi larsewi force-pushed the win-glob-compat branch 3 times, most recently from e5b5a64 to 2148b93 Compare January 19, 2024 10:51
@cfengine cfengine deleted a comment from cf-bottom Jan 23, 2024
@larsewi larsewi changed the title CFE-3292: Removed soft fail for brace support in globs CFE-3292: Removed soft fail related to the use of globs Jan 23, 2024
@larsewi larsewi marked this pull request as ready for review January 23, 2024 08:36
@larsewi larsewi mentioned this pull request Jan 23, 2024
Merged
3 tasks
@olehermanse
Copy link
Member

@cf-bottom jenkins, please

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10386/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10386/

@craigcomstock
Copy link
Contributor

Build Status

@craigcomstock
Copy link
Contributor

@cf-bottom jenkins with exotics (jenkins upgrade test and re-run of aborted CI due to upgrade)

@cf-bottom
Copy link

Sure, I triggered a build:

Build Status

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10412/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10412/

@craigcomstock
Copy link
Contributor

hpux failure

19:11:04 ERROR: glob_lib_test.c:394 Failure!

suse-15 errors are all jenkins upgrade related, lack of 'sys' group and such.

@larsewi
Copy link
Contributor Author

larsewi commented Feb 7, 2024

@cf-bottom, I tried to fix a bug on Windows, can I have a new build in Jenkins to test if it works?

@cf-bottom
Copy link

Sure, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10417/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10417/

craigcomstock
craigcomstock previously approved these changes Feb 7, 2024
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.

tests/acceptance/01_vars/02_functions/findfiles.cf Outdated Show resolved Hide resolved
@larsewi larsewi force-pushed the win-glob-compat branch 5 times, most recently from 09b2237 to e84e8f4 Compare February 14, 2024 10:04
@larsewi
Removed soft fail for brace support test in glob patterns
7a3c2dc 
Ticket: CFE-3292
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@olehermanse
Copy link
Member

@cf-bottom Jenkins, please

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10490/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10490/

@larsewi
Added include <glob_lib.h> where needed after moving GlobFileList()
e86b4d2 
Ticket: None
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@larsewi
findfiles.cf: Fixed wrong assumption acceptance test
710985e 
Previously the shell pattern `**` matched from one to six
subdirectories, while it should match any number of subdirectories from
zero. NorthernTechHQ/libntech#207 patrially
fixes this problem by making it match from zero to six subdirectories,
with a note to fix the limit (six) in CFE-4317. This fix caused this
acceptance test to break, as it now also include the test directory
itself (`"$(G.testdir)"`) in the actual result when testing the
`"$(G.testdir)/**"` shell pattern. It was easily fixed by modifying the
shell pattern to `"$(G.testdir)/*/**"`.

Ticket: None
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@larsewi
Added #include<sequence.h> to getopt_test.c
46a3a79 
Before this dependency was indirectly included from `string_lib.c`. This
is no longer the case.

Signed-off-by: larsewi <lars.erik.wik@northern.tech>
@larsewi larsewi force-pushed the win-glob-compat branch 4 times, most recently from fffa0e8 to 66df370 Compare February 21, 2024 12:02
@craigcomstock
Copy link
Contributor

@cf-bottom jenkins please with exotics

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10493/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10493/

@larsewi larsewi force-pushed the win-glob-compat branch 2 times, most recently from 8ab44da to ea91b10 Compare February 22, 2024 14:11
@larsewi
Copy link
Contributor Author

larsewi commented Feb 22, 2024

@cf-bottom Jenkins with exotics please :)

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10498/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10498/

@larsewi
Copy link
Contributor Author

larsewi commented Feb 23, 2024

HP-UX failure looks like rsync failures. Sequential test is marked as unstable.

@larsewi
Fixed bug related to backwards directory traversial in findfiles_up()
4736ad4 
The backwards directory traversial in policy function findfiles_up() did
not work properly when using forward slashes in the path argument on
Windows. Fixed this issue by changing forward slashes to backslashes in
the path argument before performing the backwards traversial.

Ticket: None
Changelog: Fixed bug related to failing backwards directory traversial
           when using forward slashes in path argument of the
           findfiles_up() policy function on Windows.
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@larsewi
Reworked the acceptance test for findfiles_up()
7b28b81 
Resolved acceptance test failure on Windows caused by invalid use of
regular expressions consisting of paths with backslashes. The paths were
triggering illegal escape sequence errors in PCRE2. Recognizing the
complexity of the existing test, I opted for a complete rewrite.
Additionally, I eliminated all dependencies to facilitate a standalone
file that can easily be run on Windows.

Ticket: None
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@larsewi
Bumped libntech to master
a95b724 
Ticket: None
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
@larsewi
Copy link
Contributor Author

larsewi commented Feb 23, 2024

@cf-bottom Jenkins with exotics please :)

@cf-bottom
Copy link

Alright, I triggered a build:

Build Status

(with exotics)

Jenkins: https://ci.cfengine.com/job/pr-pipeline/10501/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-10501/

@larsewi larsewi mentioned this pull request Feb 26, 2024
Closed
@larsewi
Copy link
Contributor Author

larsewi commented Feb 26, 2024

HP-UX is flaky rsync errors, otherwise all green 💚

@larsewi larsewi merged commit bca1a81 into cfengine:master Feb 26, 2024
52 of 53 checks passed
craigcomstock pushed a commit to craigcomstock/core that referenced this pull request Jun 26, 2024
@larsewi @craigcomstock
Bumped libntech to commit to match glob fixes: cfengine#5413
6dfbfd2 
Ticket: None
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
(cherry picked from commit a95b724)
@craigcomstock craigcomstock mentioned this pull request Jun 26, 2024
Closed
@craigcomstock
Copy link
Contributor

cherry picked to 3.21.x
#5555

craigcomstock pushed a commit to craigcomstock/core that referenced this pull request Jul 24, 2024
@larsewi @craigcomstock
Bumped libntech to commit to match glob fixes: cfengine#5413
a60b7d9 
Ticket: None
Changelog: None
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
(cherry picked from commit 2340098)
@larsewi larsewi deleted the win-glob-compat branch December 3, 2024 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olehermanse olehermanse olehermanse approved these changes

@nickanderson nickanderson Awaiting requested review from nickanderson

@craigcomstock craigcomstock Awaiting requested review from craigcomstock

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@larsewi @olehermanse @cf-bottom @craigcomstock