85632 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	3c565d7e54	Use salt.utils.fopen	2018-04-13 13:14:19 -07:00
Daniel A. Wozniak	aa965310f1	Clean up cruft	2018-04-13 10:27:17 -07:00
Daniel A Wozniak	efc9866580	Jinja test fixes	2018-04-13 10:23:34 -07:00
Nicole Thomas	1700a10ebe	Merge pull request #46326 from kstreee/fix-client-local ... Fixes a timing bug of saltnado's client local.	2018-04-13 09:59:27 -04:00
Nicole Thomas	c3c00316c5	Merge pull request #46913 from lomeroe/2017_7-fix46877 ... 2017.7 Fix #46877 -- win_lgpo start/shutdown script reading	2018-04-12 11:10:49 -04:00
Nicole Thomas	9e37cfc9d6	Merge pull request #47025 from terminalmage/fix-server_id-windows ... Fix server_id grain in PY3 on Windows	2018-04-12 11:07:59 -04:00
Nicole Thomas	2e193cfb45	Merge pull request #47027 from rallytime/bp-44508 ... Back-port #44508 to 2017.7	2018-04-12 11:05:50 -04:00
Daniel Wallace	385fe2bc1e	Merge pull request #47020 from rallytime/bp-46970 ... Back-port #46970 to 2017.7	2018-04-11 16:48:24 -05:00
zbroch	8e72f362f4	Add priority field to support the latest capirca.	2018-04-11 12:47:48 -04:00
zbroch	112f92baab	Add priority field to support the latest capirca.	2018-04-11 12:47:48 -04:00
Erik Johnson	cb0cf89ed3	Fix server_id grain in PY3 on Windows ... https://github.com/saltstack/salt/pull/46649 caused a regression on Windows since the executable path does not exist. This fixes that grain on Windows by using `sys.executable`.	2018-04-11 11:33:12 -05:00
Gareth J. Greenaway	9373dff52b	Update test_pkgrepo.py	2018-04-11 10:55:36 -04:00
Gareth J. Greenaway	13cf9eb5b1	Removing debugging.	2018-04-11 10:55:36 -04:00
Gareth J. Greenaway	a61a8593e5	Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments.	2018-04-11 10:55:36 -04:00
Nicole Thomas	8f994e7cf9	Merge pull request #46539 from jfoboss/patch-1 ... #46504 Fix	2018-04-11 10:13:23 -04:00
jfoboss	6890122e41	Merge pull request #1 from twangboy/pull_46539 ... Fix unit test for win_ntp	2018-04-11 10:01:53 +03:00
Nicole Thomas	74d70e95a5	Merge pull request #46999 from gtmanfred/2017.7 ... switch pip test package	2018-04-10 17:18:32 -04:00
lomeroe	369a0645ed	move exception for clarity	2018-04-10 15:50:25 -05:00
Nicole Thomas	8adaf7f526	Merge pull request #46023 from bloomberg/parallel-orch ... add parallel support for orchestrations	2018-04-10 15:26:03 -04:00
Daniel Wallace	791af8f6ce	switch pip test package ... Using irc3-plugins-test, since this should never be updated (i manage it and it is fulfilling its only job).	2018-04-10 14:09:20 -05:00
twangboy	19c3fadbe5	Fix unit test for win_ntp	2018-04-10 12:12:17 -06:00
Mike Place	0ac0b3ca29	Merge branch '2017.7' into parallel-orch	2018-04-10 11:31:58 -06:00
Nicole Thomas	39d65a39cf	Merge pull request #46613 from myinitialsarepm/fix_puppet.fact_and_puppet.facts ... Fix puppet.fact and puppet.facts to use stdout.	2018-04-10 11:18:07 -04:00
Nicole Thomas	ba5421d988	Merge pull request #46991 from gtmanfred/windows ... use saltstack salt-jenkins	2018-04-10 10:18:59 -04:00
Daniel Wallace	98588c1dc5	use saltstack salt-jenkins	2018-04-10 09:15:50 -05:00
Nicole Thomas	00c4067585	Merge pull request #46975 from gtmanfred/windows ... Make windows work for test runs in jenkinsci	2018-04-10 09:41:17 -04:00
Peter Morris	44ecd13abc	Update tests to use cmd.run_all	2018-04-10 01:11:03 +01:00
Daniel Wallace	1f69c0d7f8	make sure windows outputs xml junit files	2018-04-09 14:43:15 -05:00
Daniel Wallace	4a2ec1bbb3	support new versions of winrm-fs	2018-04-09 12:12:14 -05:00
Nicole Thomas	7d7d40f541	Merge branch '2017.7' into fix_puppet.fact_and_puppet.facts	2018-04-09 09:18:24 -04:00
Nicole Thomas	3cf2353e41	Merge pull request #46945 from vutny/doc-faq-fix-jinja ... [DOC] Fix Jinja block in FAQ page	2018-04-09 09:05:27 -04:00
Matt Phillips	3d5e69600b	address lint issues raised by @isbm	2018-04-09 08:46:04 -04:00
Denys Havrysh	bfdf54e61d	[DOC] Fix Jinja block in FAQ page ... Closes #18835	2018-04-08 12:19:48 +03:00
Nicole Thomas	fc2f728665	Merge pull request #46925 from terminalmage/fix-file.patch-docstring ... Remove reference to directory support in file.patch state	2018-04-06 09:54:46 -04:00
Nicole Thomas	eef6c518e1	Merge pull request #46900 from rallytime/bp-46801 ... Back-port #46801 to 2017.7	2018-04-06 09:47:43 -04:00
Nicole Thomas	71839b0303	Merge pull request #46899 from rallytime/bp-45116 ... Back-port #45116 to 2017.7	2018-04-06 09:47:16 -04:00
Erik Johnson	97695657f0	Remove reference to directory support in file.patch state ... The state was not written to support patching a directory, though the file.patch remote execution function does support patching a directory. This was likely just due to a careless copypasta from the remote execution function's docstring to the state function's.	2018-04-06 06:27:47 -05:00
Matt Phillips	a9866c7a03	fix parallel mode py3 compatibility ... parallel: True codepath incompatibilities uncovered by the added tests. additionally use salt.serializers.msgpack to avoid other py2/py3/back compat issues.	2018-04-05 22:30:59 -04:00
lomeroe	32ce5bfda5	Use configparser serializer object to read psscript.ini and script.ini ... startup/shutdown script files. Fixes #46877	2018-04-05 15:47:59 -05:00
Matt Phillips	6d7730864a	removing prereq from test orch ... seems to be encountering unrelated preexisting failures in the functionality unrelated to my changes.	2018-04-05 11:45:25 -04:00
Matt Phillips	6c8a25778f	add integration test to runners/test_state to exercise parallel ... this should hopefully exercise a few different facets of parallel that were previously not covered in the code base.	2018-04-05 11:45:25 -04:00
Matt Phillips	2c86f16b39	cherry-pick cdata KeyError prevention from #39832 ... @ninja- noticed there was some useful code already in _call_parallel_target to mitigate KeyErrors for potentially empty cdata, but it wasnt being executed due to the invoking method making the same mistake before calling it. this moves that code up to eliminate that potential stacktrace. this should close #39832	2018-04-05 11:45:25 -04:00
Matt Phillips	26a96e8933	record start/stop duration for parallel processes separately ... previously durations were only recording the time to spawn the multiprocessing proc, not the actual time of completion, which is completely wrong. This should capture the full duration correctly now. We unfortunately have to duplicate start & complete times instead of using the passed in start_time attr, as that value is only a time (not date), so it is impossible to re-calculate the full duration based on that alone (ie, what happens if start_time is 23:59 with a roll-over to the next day). This fixes #44828	2018-04-05 11:45:25 -04:00
Matt Phillips	e4844bdf2b	revisit previous join() behavior in check_requisites ... rather than join()'ing on each running process, we instead use check_running to assert completion of our processes. This should provide more correct timing results, as measuring durations of a longer running join()'d process could trample a shorter parallel process that just happened to be checked after instead of before.	2018-04-05 11:45:25 -04:00
Matt Phillips	f00a359cdf	join() parallel process instead of a recursive sleep ... its not clear to me why the recursive calls were chosen originally. this should address https://github.com/saltstack/salt/issues/43668	2018-04-05 11:45:25 -04:00
Matt Phillips	6e7007a4dc	add parallel support for orchestrations ... originally the parallel global state requisite did not work correctly when invoked under an orch - this fixes that; as well as running any other saltmod state (function, runner, wheel).	2018-04-05 11:45:25 -04:00
yagnik	6a41e8b457	rename jenkins to jenkinsmod	2018-04-05 11:30:00 -04:00
Arif Ali	b92f908da4	fix adding parameters to http.query from sdb yaml	2018-04-05 11:27:33 -04:00
Nicole Thomas	d0f5b43753	Merge pull request #44926 from frogunder/whitelisted_acl ... whitelist_acl_test	2018-04-05 11:09:25 -04:00
Mike Place	7d822f9cec	Merge pull request #46464 from gtmanfred/orchestration ... fix salt subset in orchestrator	2018-04-05 09:52:00 -05:00