Commit Graph

84777 Commits

Author SHA1 Message Date
Erik Johnson
cdda66d759
Remove duplicated section in docstring and fix example 2018-02-08 16:31:23 -05:00
Erik Johnson
4b6351cda6
Check the effective saltenv for cached archive
This fixes a regression caused by using a saltenv other than `base`.
2018-02-08 16:31:23 -05:00
Nicole Thomas
1439da8d76
Merge pull request #45755 from terminalmage/issue45743
salt.crypt: Ensure message is encoded before signing
2018-01-29 14:04:49 -05:00
Erik Johnson
8af1251c59
salt.crypt: Ensure message is encoded before signing 2018-01-29 10:53:37 -06:00
Nicole Thomas
fe194d755f
Merge pull request #45700 from Ch3LL/7.3_rn
Add PRs to 2017.7.3 Release Notes
2018-01-25 15:56:44 -05:00
Ch3LL
84c8216901
Add PRs to 2017.7.3 Release Notes 2018-01-25 15:51:34 -05:00
Nicole Thomas
ce41f6a6ee
Merge pull request #45681 from damon-atkins/2017.7.3_win_release_notes
2017.7.3 Release notes for Windows
2018-01-25 10:13:17 -05:00
Nicole Thomas
2f303439b7
Merge pull request #45672 from rallytime/bp-45667
Back-port #45667 to 2017.7.3
2018-01-25 09:04:53 -05:00
Damon Atkins
1d21f86228
Update 2017.7.3.rst 2018-01-25 19:37:32 +11:00
Daniel Wallace
74bbaeb7ce
we should default to upgrading when refreshing on archlinux
Archlinux does not do resolution for soname bumps, so if one set of packages is
updated, but something depended on a dependency package's soname, and it is
bumped, the other package will break.

When refreshing the package database, there should always be a -Su, run to
upgrade all other packages on the system.  But still allow sysupgrade to be set
to false to override this behavior.

http://gist.io/5660494

make review changes
2018-01-24 17:19:44 -05:00
Nicole Thomas
23ff1264e0
Merge pull request #45669 from rallytime/man-pages-2017.7.3
Update man pages for 2017.7.3 release
2018-01-24 16:04:59 -05:00
rallytime
d31b41adeb
Update man pages for 2017.7.3 release 2018-01-24 13:46:43 -05:00
Nicole Thomas
9a17405ba6
Merge pull request #45666 from terminalmage/salt-jenkins-793
Fix failing pkg integration tests for releases with no '.'
2018-01-24 12:19:09 -05:00
Erik Johnson
4a6ab729dd
Fix failing pkg integration tests for releases with no '.'
Fedora releases are integers, and Arch's osrelease is simply `rolling`,
so https://github.com/saltstack/salt/pull/45636 caused these tests to
regress. This fixes them by moving the osrelease check until after the
MacOS check.

It also fixes the windows check, which would _always_ evaluate to `True`
since it was not calling the function. Therefore, the `if` would just be
a simple boolean which would resolve to `True` since it was just checking
a function reference.
2018-01-24 10:13:22 -06:00
Erik Johnson
0717f7a578
Merge pull request #45664 from rallytime/bp-45452
Back-port #45452 to 2017.7.3
2018-01-24 09:33:12 -06:00
Alejandro del Castillo
369720677b
opkg.py: make owner function return value, instead of iterator
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-01-24 10:21:00 -05:00
Nicole Thomas
7934372b7b
Merge pull request #45649 from rallytime/bp-45634
Back-port #45634 to 2017.7.3
2018-01-24 09:59:42 -05:00
Nicole Thomas
770f0c4664
Merge pull request #45654 from twangboy/win_fix_shell_info_2017.7.3
Merge forward #45638
2018-01-24 09:59:13 -05:00
Erik Johnson
6fc293da46
Merge pull request #45653 from rallytime/bp-45611
Back-port #45611 to 2017.7.3
2018-01-23 23:20:11 -06:00
twangboy
5bb01aeb8c
Merge forward #45638 2018-01-23 16:01:35 -07:00
Erik Johnson
0a6b06d8ea
Fix unnecessary/incorrect usage of six.binary_type 2018-01-23 17:54:27 -05:00
Nicole Thomas
0a07e0d259
Merge pull request #45642 from rallytime/bp-45636
Back-port #45636 to 2017.7.3
2018-01-23 17:00:29 -05:00
Nicole Thomas
f37a5b6d8d
Merge pull request #45645 from rallytime/bp-45606
Back-port #45606 to 2017.7.3
2018-01-23 16:54:45 -05:00
Ch3LL
1c78fc23ea
Add different service name for Mac 10.13 test 2018-01-23 16:53:06 -05:00
Nicole Thomas
e659793c09
Merge pull request #45641 from rallytime/bp-45508
Back-port #45508 to 2017.7.3
2018-01-23 16:18:38 -05:00
Erik Johnson
d52d96f30a
Fix bug affecting salt-ssh when root_dir differs from the default
H/T https://github.com/saltstack/salt/issues/44957#issuecomment-356122811
2018-01-23 15:04:50 -05:00
Frode Gundersen
e6917a291e
fix test_archive test for mac on 2017.7 branch 2018-01-23 14:35:32 -05:00
Ch3LL
df0ad54c9a
remove unnecessary variable for test 2018-01-23 11:47:32 -05:00
Ch3LL
acb14fd43d
fix pylint 2018-01-23 11:42:49 -05:00
Ch3LL
a9b12cd1ea
Fix mac service and pkg tests for 10.13 2018-01-23 11:39:06 -05:00
Nicole Thomas
ced3269ae8
Merge pull request #45604 from rallytime/bp-45582
Back-port #45582 to 2017.7.3
2018-01-22 11:54:14 -05:00
rallytime
bc8a450cc7
Remove state.py utils file from thin list
It doesn't exist in 2017.7
2018-01-22 08:53:25 -05:00
Erik Johnson
629e6c9674
Further fixes to for salt-ssh test under heavy load
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
2018-01-22 07:33:42 -05:00
Erik Johnson
0dff596b59
Add salt/utils/state.py to thin tarball
This is required since some of the code in salt/modules/state.py was
moved into salt/utils/state.py so it could be reused.
2018-01-22 07:33:42 -05:00
Erik Johnson
a61afda100
Pass on OSError if thin tarball already removed
This can happen in the test suite while running
integration.ssh.test_state.SSHStateTest.test_state_running because the
instance of salt-ssh running in the background has completed during the
second salt-ssh run, and since the contents of the thin tarball haven't
changed between runs, the checksum used to derive the path of the thin
tarball hasn't changed, so it is unlinked before the 2nd salt-ssh run in
that test completes.
2018-01-22 07:33:41 -05:00
Daniel Wallace
4672baa6c8
Merge pull request #45591 from gtmanfred/2017.7.3
mark minion_blackout tests as flaky
2018-01-21 17:14:30 -07:00
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
Daniel Wallace
f7fd35fc4a
test updating the minion blackout timeout to 10 seconds 2018-01-21 14:42:56 -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