Denys Havrysh
af743ff6c3
[DOCS] Add missing utils sub-dir listed for extension_modules
2017-08-22 12:18:42 +03:00
Mike Place
e2bf2f448e
Merge pull request #42985 from DSRCorporation/bugs/15171_recursion_limit
...
Properly handle `prereq` having lost requisites.
2017-08-21 16:49:38 -06:00
Mike Place
e51333306c
Merge pull request #43092 from mitodl/2016.11
...
Fixed issue with silently passing all tests in Testinfra module
2017-08-21 14:22:07 -06:00
Mike Place
77a443ce8e
Merge pull request #43060 from twangboy/osx_update_pkg_scripts
...
Osx update pkg scripts
2017-08-21 14:06:11 -06:00
Tobias Macey
d4b113acdf
Fixed issue with silently passing all tests in Testinfra module
...
The Testinfra module had a line where the collection of passed arguments was silently overwritten so that it would not actually perform any assertions. Updated the variable names to address the issue of the parameters being clobbered so that asertions are performed properly.
2017-08-21 13:34:43 -04:00
Nicole Thomas
1b1b6da803
Merge pull request #43064 from terminalmage/issue42869
...
Fix race condition in git.latest
2017-08-21 10:29:52 -04:00
Erik Johnson
093c0c2f77
Fix race condition in git.latest
...
The git.latest state runs a `git ls-remote` on the remote repo to
discover which SHA it should end up at, and whether or not it needs to
fetch from the repo to get the commit it needs. However, since we
fast-forward using a `git merge` to the branch specified in the `rev`
argument, this leaves the state susceptible to a race condition when
someone pushes to the remote repo between when we run the `git
ls-remote` and when we fetch the remote repo. We will successfully
fast-forward to the head of the branch, but that branch will be pointing
to a different commit than the one identified in the `git ls-remote`, so
we will report the state as having failed.
This commit fixes that race condition by fast-forwarding to the commit
identified in the `git ls-remote`, rather than to the branch named by
`rev`.
NOTE: This means that in these edge cases, we will report a `True`
result despite the head of the branch having advanced past the commit to
which we fast-forwarded, but that seems like a reasonable trade-off for
avoiding a race condition. If we repeated the `git ls-remote` after
fetching, we'd just be opening up a window (albeit a smaller one) for
another race condition.
2017-08-18 16:39:01 -05:00
Nicole Thomas
96e8e836d1
Merge pull request #43054 from lorengordon/fix/yumpkg/config-parser
...
Uses ConfigParser to read yum config files
2017-08-18 16:49:43 -04:00
Arount
3b2cb81a72
fix typo in salt.modules.yumpkg
2017-08-18 14:36:02 -04:00
Arount
38add0e4a2
break if leading comments are all fetched
2017-08-18 14:35:46 -04:00
Arount
d7f65dc7a7
fix configparser import & log if error was raised
2017-08-18 14:35:14 -04:00
Arount
ca1b1bb633
use configparser to parse yum repo file
2017-08-18 14:34:55 -04:00
twangboy
ef8a14cdf9
Remove /opt/salt instead of /opt/salt/bin
2017-08-18 12:19:04 -06:00
twangboy
2dd62aa1da
Add more information to the description
2017-08-18 12:09:08 -06:00
twangboy
f44f5b70dc
Only stop services if they are running
...
Otherwise it will cause an error and the installation will fail
2017-08-18 11:52:34 -06:00
twangboy
3b62bf953c
Remove salt from the path
2017-08-18 11:44:35 -06:00
twangboy
ebdca3a0f5
Update pkg-scripts
...
Improves logging
Removes /opt/salt/bin directory before install
Removes symlink to salt-config before install
2017-08-18 11:25:32 -06:00
Nicole Thomas
43aa46f512
Merge pull request #43048 from rallytime/bp-43031
...
Back-port #43031 to 2016.11
2017-08-18 08:56:03 -04:00
Daniel Wallace
35e45049e2
use a ruby gem that doesn't have dependencies
2017-08-18 08:55:02 -04:00
Steven Joseph
2b5af5b59d
Remove refs/tags prefix from remote tags
2017-08-18 18:24:31 +10:00
garethgreenaway
ad89ff3104
Merge pull request #43023 from terminalmage/fix-jenkins-xml-caching
...
Fixes/improvements to Jenkins state/module
2017-08-17 18:33:10 -07:00
garethgreenaway
2957467ed7
Merge pull request #43026 from rallytime/bp-43020
...
Back-port #43020 to 2016.11
2017-08-17 16:19:46 -07:00
garethgreenaway
4150b094fe
Merge pull request #43033 from rallytime/bp-42760
...
Back-port #42760 to 2016.11
2017-08-17 15:24:42 -07:00
garethgreenaway
33fd8ff939
Update jenkins.py
2017-08-17 15:22:31 -07:00
Mike Place
fc306fc8c3
Add missing colon in if statement
2017-08-17 15:57:42 -06:00
Mike Place
b124d3667e
Merge pull request #43032 from rallytime/bp-42547
...
Back-port #42547 to 2016.11
2017-08-17 15:53:50 -06:00
matt
73315f0cf0
Issue #43036 Bhyve virtual grain in Linux VMs
2017-08-17 17:06:17 -04:00
Aljosha Friemann
3e3f7f5d8e
Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files.
2017-08-17 16:38:37 -04:00
Tobias Macey
ea4d7f4176
Updated testinfra modules to work with more recent versions
...
The TestInfra library changed the package layout recently which caused
the extension module to stop working. This patch addresses those
updates and will work across all versions of the library.
2017-08-17 16:36:59 -04:00
Nicole Thomas
a88386ad44
Merge pull request #43027 from pabloh007/fix-docker-save-push-2016-11
...
Fixes ignore push flag for docker.push module issue #42992
2017-08-17 15:55:37 -04:00
Erik Johnson
822eabcc81
Catch exceptions raised when making changes to jenkins
2017-08-17 13:52:27 -05:00
garethgreenaway
51d16840bb
Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp
...
Make chunked mode in salt-cp optional
2017-08-17 11:37:43 -07:00
Daniel Wallace
0eb15a1f67
test with gem that appears to be abandoned
2017-08-17 14:28:39 -04:00
Pablo Hernandez
d0fd949f85
Fixes ignore push flag for docker.push module issue #42992
2017-08-17 14:24:48 -04:00
Nicole Thomas
b3c253cdfa
Merge pull request #43009 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-08-17 14:00:08 -04:00
garethgreenaway
37c63e7cf2
Merge pull request #43021 from terminalmage/fix-network-test
...
Use socket.AF_INET6 to get the correct value instead of doing an OS check
2017-08-17 10:57:08 -07:00
garethgreenaway
8f6423247c
Merge pull request #43019 from rallytime/bootstrap_2017.08.17
...
Update bootstrap script to latest stable: v2017.08.17
2017-08-17 10:56:40 -07:00
Erik Johnson
4089b7b1bc
Use socket.AF_INET6 to get the correct value instead of doing an OS check
...
This builds on #43014 with a more future-proof solution.
2017-08-17 12:12:27 -05:00
rallytime
2f762b3a17
Update bootstrap script to latest stable: v2017.08.17
2017-08-17 12:31:25 -04:00
garethgreenaway
ff1caeee68
Merge pull request #43014 from Ch3LL/fix_network_mac
...
Change AF_INET6 family for mac in test_host_to_ips
2017-08-17 09:17:50 -07:00
Erik Johnson
91b583b493
Improve and correct execption raising
...
SaltInvocationError is for invalid arguments, we should be using
CommandExecutionError elsewhere. Also, we don't use backticks as quotes.
Finally, this changes the message in the errors we raise when the
Jenkins bindings raise an exception so that it's a bit more descriptive
than "Something went wrong".
2017-08-17 10:38:50 -05:00
Erik Johnson
f096917a0e
Raise an exception if we fail to cache the config xml
2017-08-17 10:28:35 -05:00
Ch3LL
b8eee4401e
Change AF_INET6 family for mac in test_host_to_ips
2017-08-17 10:55:53 -04:00
Dmitry Kuzmenko
cfddbf1c75
Apply code review: update the doc
2017-08-17 16:47:45 +03:00
rallytime
566ba4fe76
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/conf.py
2017-08-17 09:03:44 -04:00
Dmitry Kuzmenko
651b1bab09
Properly handle prereq having lost requisites.
...
Add the result to `self.pre` instead of to `running`.
2017-08-16 18:36:09 +03:00
Nicole Thomas
1ee9499d28
Merge pull request #42968 from vutny/doc-salt-cloud-ref
...
[DOCS] Fix link to Salt Cloud Feature Matrix
2017-08-16 09:16:16 -04:00
Steven Joseph
3f2e96e561
Convert set to list for serializer
2017-08-16 21:04:37 +10:00
Denys Havrysh
44ed53b1df
[DOCS] Fix link to Salt Cloud Feature Matrix
2017-08-16 10:26:45 +03:00
Mike Place
923f9741fe
Merge pull request #42291 from vutny/fix-38839
...
Fix #38839 : remove `state` from Reactor runner kwags
2017-08-15 17:01:08 -06:00
