saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
119622 commits 34 branches 292 tags 802 MiB
Commit graph

24078 commits

Author SHA1 Message Date
Pedro Algarvio
967d3015f6
Merge 3006.x into master 2023-12-05 18:10:58 +00:00
Daniel A. Wozniak
3faee7dc28 Add master_uri to minion_opts for tests 2023-12-04 14:20:01 -07:00
David Murphy
71cc67d1af Remove debug logging and add comment for test 2023-11-29 21:40:06 +00:00
David Murphy
cd279bd7d4 Fill out lsb_distrib_xxx grains (best guess) if lsb_release information unavailable 2023-11-29 21:40:06 +00:00
Pedro Algarvio
ff2fc6de95
Run pyupgrade against the files modified in the merge-forward 2023-11-29 21:20:41 +00:00
Pedro Algarvio
02c3b89e40
Merge 3006.x into master 2023-11-29 18:31:52 +00:00
Daniel A. Wozniak
6fd852d4ee Use get_unused_port utility method 2023-11-29 10:43:44 -07:00
MKLeb
85d0a3be6c run pre-commit 2023-11-29 10:43:44 -07:00
MKLeb
9e1f46ec59 Replace localhost with 127.0.0.1 2023-11-29 10:43:44 -07:00
MKLeb
be69417af9 Swich to ghcr.io/saltstack/salt-ci-containers/tinyproxy:latest container do avoid dockerhub rate limiting 2023-11-29 10:43:44 -07:00
MKLeb
ce30baa568 HTTP is now http 2023-11-29 10:43:44 -07:00
MKLeb
5bc2054c3f Test against no proxy, GET and POST, and with/without basic auth 2023-11-29 10:43:44 -07:00
MKLeb
83d669fbb4 Add a functional test against a real proxy (tinyproxy) 2023-11-29 10:43:44 -07:00
MKLeb
2857ca7ab9 Migrate old unit tests for salt.utils.http to pytest and alter proxy tests to conform to the forced use of requests 2023-11-29 10:43:44 -07:00
Pedro Algarvio
5d5068cd63
Run pyupgrade against the files modified in the merge-forward 2023-11-29 16:35:43 +00:00
Pedro Algarvio
7cf72a7797
Merge 3006.x into master 2023-11-29 14:43:39 +00:00
butch12
8235409c51 maintain user-defined options in apt source definitions 2023-11-28 20:02:59 +00:00
Pedro Algarvio
f60c87aacb
Merge 3006.x into master 2023-11-28 17:46:50 +00:00
Pedro Algarvio
0e6c054095 Reduce flakyness by reducing the worker threads and forcing the pillar timeout 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-28 15:33:17 +00:00
jeanluc
2577728579 Add tests for issue 64588 2023-11-28 10:44:24 +00:00
jeanluc
92b46fb4ff Fix salt-ssh stacktrace when retcode is not an integer 2023-11-28 10:44:24 +00:00
Gareth J. Greenaway
f9e3a59882 Additional package name for OS X 13. 
(cherry picked from commit ad05dce33a)
 2023-11-28 04:04:05 +00:00
Gareth J. Greenaway
1c869daf6d fixes for MacOS X 13 
(cherry picked from commit 6640b05216)
 2023-11-28 04:04:05 +00:00
Pedro Algarvio
3afb77d7af Erm... Skip it! 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 21:13:22 +00:00
Pedro Algarvio
96c3c8e04a Fix the capability package name. The old one no longer exists. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 21:13:22 +00:00
Pedro Algarvio
94d3d80f98 Skip test on PhotonOS 3 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 21:13:22 +00:00
Pedro Algarvio
eaf5245965 Let's fake the filesystem instead 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 21:13:22 +00:00
Gareth J. Greenaway
737cb6cbfb Migrate tests/pytests/functional/modules/test_mac_system.py to functional tests 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 21:13:22 +00:00
Pedro Algarvio
2c8d078827 Match timeout 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 21:13:22 +00:00
jeanluc
ab35c07c47 Use already parsed JSON in ret.data 2023-11-26 17:25:38 +00:00
jeanluc
27334a4935 Refactor state tests again 2023-11-26 17:25:38 +00:00
jeanluc
6e312ce8be Refactor state SSH wrapper integration tests 2023-11-26 17:25:38 +00:00
jeanluc
ec3a988390 cleanup 2023-11-26 17:25:38 +00:00
jeanluc
5adb7ec17b Fix salt-ssh master access during pillar rendering 
This also ports #50489 into the present
 2023-11-26 17:25:38 +00:00
jeanluc
941ccbee6f Update salt-ssh state wrapper pillar handling 
Instead of passing the pre-rendered pillar as an override, do it like
the regular `state` execution module does with `salt-call`: Check if the
pillar needs to be rendered, otherwise reuse the already rendered one.

Also, ensure that __pillar__ in wrapper modules contains the same one
used during rendering, same thing for the one passed to `state.pkg`.

Also, ensure that when pillars are rerendered during a state run, they
get the master opts in addition to the minion ones, since some modules
used in the pillar can rely on them to be present.

Also, ensure pillar overrides are accepted for the same functions as with
the regular `state` execution module.
 2023-11-26 17:25:38 +00:00
Pedro Algarvio
250704b18c
Run pyupgrade against the files modified in the merge-forward 2023-11-26 16:24:07 +00:00
Pedro Algarvio
a420d94431
Merge 3006.x into master 2023-11-26 16:10:40 +00:00
Pedro Algarvio
a1bf32c881 Skip performance tests on PhotonOS. 
They were also getting skipped previously.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Pedro Algarvio
e37e984427 Pull the containers prior to starting the daemons. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Pedro Algarvio
4ee029f1f7 Move the install salt routine to the custom salt minion class implementation 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Pedro Algarvio
72aa076c59 Fix the libvirt tests 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Pedro Algarvio
ac98d83aa8 Be sure to set the returner address 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Pedro Algarvio
8ec9843bb3 Fix/De-complicate the performance test scenarios 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Daniel A. Wozniak
d85644015c Only warn when connect was called 2023-11-22 12:48:56 +00:00
Ryan Addessi
b06444317f Update tests/pytests/functional/states/file/test_directory.py 
lgtm, ty

Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
 2023-11-22 12:46:00 +00:00
Ryan Addessi
12ff4bf963 black 2023-11-22 12:46:00 +00:00
Ryan Addessi
7bc016f9fd skip on windows 2023-11-22 12:46:00 +00:00
Ryan Addessi
5eb5d57ea0 trying another method 2023-11-22 12:46:00 +00:00
Ryan Addessi
3069df132b & 0o7777 2023-11-22 12:46:00 +00:00
Ryan Addessi (raddessi)
7d07076040 precommit 2023-11-22 12:46:00 +00:00