Commit Graph

84740 Commits

Author SHA1 Message Date
Daniel Wallace
2a992f9017
Merge pull request #45585 from rallytime/bp-45579
Back-port #45579 to 2017.7.3
2018-01-21 17:13:58 -07:00
rallytime
0292c8345b
Lint fix: use six's map 2018-01-21 15:23:27 -05:00
rallytime
108d8cbeef
Use correct utils path for 2017.7 2018-01-21 13:01:21 -05:00
Erik Johnson
a38f4cb6d6
Restrict pyzmq optimizations to pyzmq >= 14.3.0
The optimizations added in 00f31bf cause problems with older ZMQ
versions.
2018-01-21 08:50:26 -05:00
Erik Johnson
58ad558346
Fix event unpack 2018-01-21 08:46:22 -05:00
Nicole Thomas
19cd97ed3b
Merge pull request #45573 from gtmanfred/2017.7.3
update 2017.7.3 tests
2018-01-20 15:05:12 -05:00
Daniel Wallace
bd3cb47fa7
fix mock for opensuse
Opensuse needs a run_all in here, mock it so we don't see an error, and still
test the docker stuff
2018-01-20 09:58:22 -07:00
Daniel Wallace
808e26e69a
test simple website 2018-01-20 09:57:20 -07:00
Nicole Thomas
e72d81ef22
Merge pull request #45570 from gtmanfred/2017.7.3
Fix tests for 2017.7.3
2018-01-20 10:01:20 -05:00
Daniel Wallace
1f71f301ba
specify checking man page path
Without setting the man path, this would be checking that the installed salt
package used to bootstap has an spm man page, which is possible that it
doesn't, and also not what we want to check
2018-01-19 17:53:20 -07:00
Daniel Wallace
2ddbcb45c1
fix pkg_resources for usage with testing pip
We do weird things with the pip modules for salt-jenkins, we need to directly
import the module instead of a function from the module for the namespacing we
do there to work.
2018-01-19 16:44:08 -07:00
Daniel Wallace
0ba39a7108
switch systemd-journald for sshd for arch service test
the running tests run second because of alphabetical order, and stopping sshd
does not kill off the running connection, so we know that sshd has to be on
arch for us to connect, so stop it with dead and start it back with running.

It is also not possible to stop the systemd-journald process without shutting
down the full machine.
2018-01-19 15:17:53 -07:00
Nicole Thomas
7bc60c56d4
Merge pull request #45538 from gtmanfred/2017.7.3
Backport test fixes to 2017.7.3
2018-01-19 09:39:43 -05:00
Daniel Wallace
801e0639b6
Merge branch '2017.7.3' into 2017.7.3 2018-01-18 17:49:19 -07:00
Nicole Thomas
8ad65e3359
Merge pull request #45533 from rallytime/bp-45529
Back-port #45529 to 2017.7.3
2018-01-18 17:52:28 -05:00
Daniel Wallace
8d907ee1a0
fix moto version
Fixes saltstack/salt-jenkins#692
2018-01-18 14:56:31 -07:00
Daniel Wallace
1241ab5fc6
fix test boto imports
Test boto imports are failing for some reason
2018-01-18 14:56:27 -07:00
Daniel Wallace
f4b6367cf9
fix fedora pkg test
yum is no longer installed by default on fedora.  apparently it has been
removed from the base installs, and only dnf is available.  Stop depending on
the pkg manager, and just use bash.
2018-01-18 14:54:54 -07:00
Ch3LL
6d56c64d88
Fix UnboundLocalError for pacman pkg installs 2018-01-18 14:03:14 -05:00
Nicole Thomas
7379f9e3e5
Merge pull request #45442 from rallytime/bp-45399
Back-port #45399 to 2017.7.3
2018-01-17 12:20:47 -05:00
Nicole Thomas
ee5090f69b
Merge pull request #45468 from twangboy/win_reg
Fix some issues with reg.py
2018-01-16 17:23:46 -05:00
twangboy
a0d21c6354
Fix some issues with reg.py 2018-01-16 12:25:52 -07:00
rallytime
590a6db626
Lint: use support TMP path instead of integration TMP path 2018-01-16 09:13:27 -05:00
Erik Johnson
c081b2c62c
Fix git.latest failure when rev is not the default branch 2018-01-14 08:23:38 -05:00
Nicole Thomas
ef7a896eb6
Merge pull request #45434 from rallytime/bp-45174
Back-port #45174 to 2017.7.3
2018-01-14 07:43:15 -05:00
Eric Radman
b310ff7ab8
Do not force pkg reinstall on FreeBSD
Partially reverts commit f9ef30a

Regression reported in issue #44913
2018-01-13 14:55:13 -05:00
Nicole Thomas
c3fdd1dcc4
Merge pull request #45395 from rallytime/bp-45380
Back-port #45380 to 2017.7.3
2018-01-12 13:49:20 -05:00
twangboy
0356b3d56f
Backport changes from #45308 2018-01-11 15:36:38 -05:00
Nicole Thomas
f7da716d32
Merge pull request #45294 from gtmanfred/2017.7
include backports_abc
2018-01-11 13:18:15 -05:00
Nicole Thomas
f77a3e9cd4
Merge pull request #45381 from gtmanfred/module.run
fix module.run docs
2018-01-11 13:02:37 -05:00
Nicole Thomas
8efd29f4d9
Merge pull request #45368 from DSRCorporation/bugs/zmq_draft
Fixes to work with pyzmq with --enable-drafts
2018-01-11 12:53:15 -05:00
Nicole Thomas
22c3efda06
Merge pull request #45371 from rallytime/bp-45158
Back-port #45158 to 2017.7
2018-01-11 12:51:37 -05:00
Nicole Thomas
3a0e2de995
Merge pull request #45387 from renner/patch-2
Set SHELL environment variable
2018-01-11 11:23:21 -05:00
Nicole Thomas
dcf98a2260
Merge pull request #45388 from terminalmage/fix-test-loader-error
Fix loader error in 2017.7 tests
2018-01-11 11:13:52 -05:00
Daniel Wallace
230e899192
fix module.run docs 2018-01-11 09:12:19 -07:00
Erik Johnson
5473c085d9
Fix loader error in 2017.7 tests 2018-01-11 08:40:27 -06:00
Nicole Thomas
d15f9e1020
Merge pull request #45382 from terminalmage/salt-jenkins-686
Skip flaky test on 2017.7 branch
2018-01-11 09:23:04 -05:00
Johannes Renner
530ddd2d29
Set SHELL environment variable
When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed to execute the given command.
2018-01-11 13:37:38 +01:00
Dmitry Kuzmenko
7622e355cf
Minor: removed a stale comment. 2018-01-11 14:03:41 +03:00
Dmitry Kuzmenko
00f31bf9b5
Fixes to work with pyzmq with --enable-drafts
1. Let pyzmq to correctly cleanup stream by itself

2. Don't close IOLoop that closes managed IO objects until full async
object cleanup that produces closing streams and attempts to operate to
strutures deinitialized by the closed IOLoop.
2018-01-11 14:03:38 +03:00
Nicole Thomas
dbe21b2c0d
Merge pull request #45369 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-10 17:14:04 -05:00
Erik Johnson
ff3039db6c
Skip flaky test on 2017.7 branch
The behavior of the set union used to combine ext_nodes and top file
matches is not consistent on Python 3 (well, 3.5 at least), and this
produces flaky test results.

Since we do not change things like the state compiler in point
releases, the method used to combine the ext_nodes and top file matches
has been changed for Oxygen and is now fully deterministic. This test
will therefore be skipped for the remainder of the 2017.7 release cycle
on Python 3.

Fixes https://github.com/saltstack/salt-jenkins/issues/686.
2018-01-10 16:02:32 -06:00
Nicole Thomas
55979b3a48
Merge pull request #45379 from rhoths/rhoths-doc-highstate-1
Minor spelling/grammar fixes in the highstate returner documentation
2018-01-10 15:09:51 -05:00
Chase Urich
afbbd492cd Minor spelling/grammar fixes in highstate returner 2018-01-10 12:18:55 -06:00
Daniel Wallace
3633ceeaa7
Merge branch '2017.7' into 2017.7 2018-01-10 11:11:29 -07:00
Nicole Thomas
541e59fa75
Merge pull request #45358 from UtahDave/gate_data_cache_refresh
gate the minion data cache refresh events.
2018-01-10 12:21:04 -05:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests
This was the _actual_ cause of the failing test in the state module
integration tests.
2018-01-10 10:29:15 -05:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.

This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2018-01-10 10:29:15 -05:00
rallytime
f65e091df8
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-01-10 10:15:19 -05:00
Daniel Wallace
29806e4496
ignore salt.ext in pylint 2018-01-09 17:49:50 -07:00