72 Commits

Author	SHA1	Message	Date
rallytime	bf6c788350	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/client/ssh/__init__.py - salt/utils/thin.py	2018-06-30 09:48:06 -04:00
Nicole Thomas	fbbafc8de4	Merge pull request #48300 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-06-30 08:58:27 -04:00
Brett Benassi	54660e8e40	Changing debug to info for logging	2018-06-28 14:48:27 -06:00
Brett Benassi	d8260b6628	Changing debug to info for logging	2018-06-28 14:46:31 -06:00
rallytime	fface7cc74	Merge branch '2018.3.2' into '2018.3' ... Conflicts: - tests/integration/runners/test_state.py	2018-06-28 10:05:18 -04:00
rallytime	6177d6e3c1	Merge branch '2018.3' into 'develop' ... Conflicts: - doc/ref/configuration/minion.rst - salt/client/__init__.py - salt/grains/core.py - salt/modules/timezone.py - tests/support/case.py - tests/unit/modules/test_file.py - tests/unit/roster/test_sshconfig.py	2018-06-25 11:26:25 -04:00
rallytime	398cc78224	Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml - doc/topics/releases/2017.7.6.rst - salt/modules/timezone.py - tests/support/case.py - tests/unit/modules/test_timezone.py	2018-06-15 16:51:45 -04:00
Daniel Wallace	6128519e8b	bootstrap kitchen branch tests with 2017.7.6	2018-06-14 12:10:32 -05:00
Daniel Wallace	56b074ab27	allow specifying a different state to run on converge	2018-06-07 15:49:54 -05:00
Daniel Wallace	cc9c4b4d5a	add pytest coverage and xml junits	2018-06-07 12:53:22 -05:00
rallytime	cf58ae22bf	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/states/pip_state.py - tests/unit/utils/test_stringutils.py	2018-05-09 11:40:54 -04:00
rallytime	786076ac03	Merge branch '2017.7' into '2018.3' ... Conflicts: - pkg/windows/modules/get-settings.psm1 - salt/modules/cmdmod.py - salt/modules/pip.py - salt/modules/win_lgpo.py - salt/states/pip_state.py - tests/integration/states/test_pip.py - tests/support/helpers.py - tests/unit/modules/test_pip.py - tests/whitelist.txt	2018-05-07 13:17:01 -04:00
Daniel Wallace	99e150e09c	check for kitchen-vagrant gem before loading windows tests	2018-05-04 09:45:53 -05:00
Daniel Wallace	d228e72477	update ubuntu-rolling to 18.04	2018-05-03 12:02:22 -05:00
Daniel Wallace	33f378a9e7	Update .kitchen.yml ... develop should have the master repo of salt-jenkins	2018-05-03 11:48:20 -05:00
rallytime	94c2a12be6	Merge branch '2017.7' into '2018.3' ... Conflicts: - tests/integration/modules/test_state.py - tests/unit/templates/test_jinja.py - tests/unit/test_minion.py	2018-04-17 10:54:42 -04:00
Daniel A. Wozniak	c3941efad0	Kitchn should ignore artifacts directory	2018-04-14 00:42:04 -07:00
rallytime	ccc5bad2df	Merge branch '2017.7' into merge-2018.3 ... Conflicts: - .kitchen.yml	2018-04-10 10:23:02 -04:00
Daniel Wallace	98588c1dc5	use saltstack salt-jenkins	2018-04-10 09:15:50 -05:00
rallytime	2f1cf3e511	Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml	2018-04-10 10:11:35 -04:00
Daniel Wallace	1f69c0d7f8	make sure windows outputs xml junit files	2018-04-09 14:43:15 -05:00
Daniel Wallace	91474878fa	don't copy __pycache__ or .pyc files for kitchen	2018-04-06 14:15:02 -05:00
Daniel Wallace	b03e272e44	windows work	2018-04-04 13:37:39 -05:00
rallytime	e312efb5e7	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/modules/cmdmod.py - salt/modules/pillar.py - salt/modules/yumpkg.py - salt/state.py - salt/utils/pkg/rpm.py - salt/utils/schedule.py - tests/integration/states/test_npm.py - tests/integration/states/test_pkgrepo.py	2018-03-27 16:31:55 -04:00
rallytime	8d1e1e7f94	Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml - Gemfile - pkg/windows/build_env_2.ps1 - pkg/windows/build_env_3.ps1 - pkg/windows/req.txt - salt/client/ssh/__init__.py - salt/client/ssh/ssh_py_shim.py - salt/modules/boto_vpc.py - salt/modules/file.py - salt/modules/heat.py - salt/modules/smartos_vmadm.py - salt/modules/win_dsc.py - salt/returners/elasticsearch_return.py - salt/runners/salt.py - salt/states/module.py - salt/utils/win_functions.py - setup.py - tests/integration/modules/test_state.py - tests/unit/grains/test_core.py - tests/unit/test_pillar.py	2018-03-15 17:22:05 -04:00
Daniel Wallace	c76f7eb028	enable debug logging on the minionlog	2018-03-15 14:29:54 -06:00
Daniel Wallace	2c39ac6dfb	disable verbose	2018-03-15 10:35:35 -06:00
Daniel Wallace	289c7a228f	retry if there is a segfault	2018-03-14 07:52:18 -04:00
Daniel Wallace	50d6e2c7be	retry if there is a segfault	2018-03-13 16:40:35 -06:00
Daniel Wallace	da002f78d0	include virtualenv path for py3 windows	2018-03-12 12:24:51 -06:00
Daniel Wallace	fe2efe03ea	remove duplicate setup	2018-03-12 11:14:33 -06:00
Daniel Wallace	b8ab8434a5	fix windows for kitchen	2018-03-08 09:43:36 -07:00
Daniel Wallace	c56baa95a8	clone .git for the version tests	2018-03-06 15:36:35 -07:00
Daniel Wallace	5219f7d2ba	fix minion log path	2018-03-06 14:53:11 -07:00
Daniel A. Wozniak	51b0e54ffe	Update salt-jenkins branch in kitchen config	2018-03-05 15:58:48 -07:00
Daniel Wallace	3c9eed8929	pull minion log from kitchen sandbox	2018-01-23 07:38:36 -07:00
Daniel Wallace	a8341fea01	clean up for windows tests for kitchen-salt	2018-01-06 17:14:46 -07:00
Daniel Wallace	9ab1af738f	switch kitchen-salt to use rsync transport to preserve symlinks	2018-01-04 17:29:45 -05:00
Daniel Wallace	cf98ed472e	fix up symlinks	2018-01-04 17:29:45 -05:00
Daniel Wallace	cb8036e680	switch kitchen-salt to use rsync transport to preserve symlinks	2018-01-03 16:07:26 -07:00
Daniel Wallace	19198fd866	fix up symlinks	2018-01-03 15:08:42 -07:00
Daniel Wallace	4f3b089e0e	fix copying back	2017-12-31 11:10:28 -07:00
Daniel Wallace	f56f062a6a	download xml for junit	2017-12-31 11:10:16 -07:00
Daniel Wallace	7cc342a5d6	use new runtests verifier	2017-12-31 11:10:01 -07:00
Daniel Wallace	b7932901ca	fix copying back	2017-12-30 11:00:03 -07:00
Daniel Wallace	8cb15ec689	download xml for junit	2017-12-29 15:00:54 -07:00
Daniel Wallace	d9e868ebd0	use new runtests verifier	2017-12-29 14:23:59 -07:00
rallytime	9ded5e1cbb	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/grains/core.py - salt/modules/win_lgpo.py - salt/returners/mysql.py - salt/states/libcloud_dns.py - tests/integration/runners/test_runner_returns.py - tests/unit/grains/test_core.py	2017-12-21 15:58:08 -05:00
Daniel Wallace	23bd38ad66	enable using kitchen-salt on ec2 ... These changes are needed to run the test suite on ec2 using sudo.	2017-12-20 17:18:39 -07:00
Daniel Wallace	0f05d8c6bb	move oxygen kitchen to use the oxygen salt-jenkins	2017-12-12 14:08:32 -07:00