valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,796 Commits 24 Branches 182 Tags 341 MiB
3b2cb81a72
Commit Graph

77796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Mike Place
c20bc7d515 Merge pull request #42940 from gtmanfred/2016.11 
create new ip address before checking list of allocated ips
 2017-08-15 15:47:17 -06:00
Nicole Thomas
d6496eca72 Merge pull request #42959 from rallytime/bp-42883 
Back-port #42883 to 2016.11
 2017-08-15 17:25:47 -04:00
Daniel Wallace
253e216a8d fix IP address spelling 2017-08-15 12:30:03 -06:00
rallytime
c6b9ca4b9e Lint fix: add missing space 2017-08-15 14:26:44 -04:00
rallytime
5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-15 14:26:44 -04:00
rallytime
a0b19bdc27 Update account id value in boto_secgroup module unit test 
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
 2017-08-15 14:23:00 -04:00
rallytime
60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-15 14:23:00 -04:00
rallytime
6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls 
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
 2017-08-15 14:22:59 -04:00
Nicole Thomas
6366e05d0d Merge pull request #42944 from Ch3LL/2016.11.6_follow_up 
[2016.11] Add clean_id function to salt.utils.verify.py
 2017-08-15 14:06:11 -04:00
Nicole Thomas
13b8637d53 Merge pull request #42942 from Ch3LL/2016.3.6_follow_up 
[2016.3] Add clean_id function to salt.utils.verify.py
 2017-08-15 13:37:46 -04:00
Mike Place
49d339c976 Merge pull request #42952 from Ch3LL/latest_2016.11 
[2016.11] Bump latest and previous versions
 2017-08-15 11:23:02 -06:00
Mike Place
bbb1b29ccb Merge pull request #42954 from Ch3LL/latest_2016.3 
[2016.3] Bump latest and previous versions
 2017-08-15 11:22:42 -06:00
Ch3LL
74e7055d54 [2016.11] Bump latest and previous versions 2017-08-15 12:54:12 -04:00
Ch3LL
b551e66744 [2016.3] Bump latest and previous versions 2017-08-15 12:53:16 -04:00
Mike Place
b0d2e05a79 Merge pull request #42950 from Ch3LL/2016.11.7_docs 
Add Security Notice to 2016.11.7 Release Notes
 2017-08-15 10:50:23 -06:00
Mike Place
5d5edc54b7 Merge pull request #42949 from Ch3LL/2016.3.7_docs 
Add Security Notice to 2016.3.7 Release Notes
 2017-08-15 10:49:12 -06:00
Ch3LL
a6f902db40 Add Security Notice to 2016.11.77 Release Notes 2017-08-15 12:35:37 -04:00