Nicole Thomas
6f934c2259
Merge pull request #47823 from Ch3LL/win_dns_test
...
Add win_dns module integration tests for windows
2018-05-25 16:34:02 -04:00
Nicole Thomas
e63e04602d
Merge pull request #47838 from rallytime/bp-47810
...
Back-port #47810 to 2017.7
2018-05-25 16:33:43 -04:00
Nicole Thomas
9ef6e60617
Merge pull request #47805 from twangboy/add_sign.bat
...
Add sign.bat script for signing packages
2018-05-25 09:53:58 -04:00
rmcintosh
bd2b62fa66
better debug message
...
also, give Cloud Profile its proper capitalization
and some minor formatting consistency updates
2018-05-25 09:33:46 -04:00
rmcintosh
83565c55df
Address PR feedback
2018-05-25 09:33:39 -04:00
rmcintosh
50bce3a2f3
make decode_linode_plan_label a private function
2018-05-25 09:33:33 -04:00
rmcintosh
2ba4fc4cea
fix raising when a 'GB' format invalid plan is supplied
2018-05-25 09:33:24 -04:00
rmcintosh
3afb50d5a2
slight cleanup
2018-05-25 09:33:17 -04:00
rmcintosh
319fbd3406
match quotation mark types properly
2018-05-25 09:33:11 -04:00
rmcintosh
95e0202223
more consistent use of parens in logged warning
2018-05-25 09:33:04 -04:00
rmcintosh
f52926ca87
log a warning when the user supplied a label we could decode but was not in the proper format
2018-05-25 09:32:57 -04:00
rmcintosh
121303d827
reduce complexity of get_plan_id by moving decoding of the user-supplied label to its own function
2018-05-25 09:32:52 -04:00
rmcintosh
cf534c7314
Fix Linode plan selection
2018-05-25 09:32:46 -04:00
Daniel Wozniak
93420950d3
Merge pull request #47500 from dwoz/winuser
...
Get the current username on windows
2018-05-24 12:14:06 -07:00
Ch3LL
7848114d6a
Add win_dns module integration tests for windows
2018-05-24 14:11:27 -04:00
Nicole Thomas
552526f309
Merge pull request #47802 from rallytime/bp-40892
...
Back-port #40892 to 2017.7
2018-05-24 12:34:35 -04:00
Nicole Thomas
0ca5224cbf
Merge branch '2017.7' into winuser
2018-05-24 12:08:35 -04:00
Daniel Wallace
c9cccf53b9
Merge pull request #47816 from Ch3LL/disable_windows
...
Add windows to service disable ERROR check in tests
2018-05-24 10:31:35 -05:00
Ch3LL
2509d36888
Add windows to service disable ERROR check in tests
2018-05-24 08:30:17 -04:00
Daniel A. Wozniak
e5948902af
Use salt utils method for this_user
2018-05-24 00:40:20 -07:00
Daniel A. Wozniak
a056a293f1
Centeralize test username lookup
2018-05-23 16:16:35 -07:00
Daniel A Wozniak
6a6ab69722
Get the current username on windows
2018-05-23 16:16:32 -07:00
Nicole Thomas
2cb6634c6b
Merge pull request #47773 from frogunder/45011
...
add win_servermanager.list_available test
2018-05-23 15:44:13 -04:00
Nicole Thomas
e65dece202
Merge pull request #47807 from dwoz/winrmtests
...
Try an even bigger timeout
2018-05-23 15:38:20 -04:00
Daniel A. Wozniak
1f1cc1357a
Increase instance size for cloud tests
2018-05-23 12:35:57 -07:00
Daniel A. Wozniak
be8dcd21f1
Try an even bigger timeout
2018-05-23 11:08:14 -07:00
twangboy
66d8b0331a
Add sign.bat script for signing packages
2018-05-23 11:20:51 -06:00
Steven Joseph
bb357da084
add minion function to reload beacon #35960
2018-05-23 13:05:22 -04:00
Nicole Thomas
46618d2ce7
Merge pull request #47765 from meaksh/2017.7-fix-zypper-error-reading-repo
...
Prevent zypper from parsing repo configuration from not .repo files
2018-05-23 10:45:03 -04:00
Nicole Thomas
0e87559ee3
Merge pull request #47781 from rallytime/update-linode-sizes
...
Update cloud test profile and docs to use new Linode size lables
2018-05-23 09:09:12 -04:00
Nicole Thomas
3ddc56cb9b
Merge pull request #47748 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.6 to 2017.7
2018-05-22 16:53:01 -04:00
Daniel Wozniak
0ddc864f90
Merge pull request #47779 from dwoz/winrmtests
...
Increase ec2 cloud timeouts to 1000
2018-05-22 13:35:44 -07:00
Daniel A. Wozniak
d5eafe9d53
Use common timeout variable
2018-05-22 13:27:26 -07:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables
...
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.
The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`.
For example, the `Linode 2048` size is now `Linode 2GB`.
2018-05-22 16:00:39 -04:00
Daniel A. Wozniak
7e948eb540
Increase ec2 cloud timeouts to 1000
2018-05-22 12:23:31 -07:00
rallytime
b75f5ae38e
Merge branch '2017.7.6' into '2017.7'
...
No conflicts.
2018-05-22 15:10:49 -04:00
Nicole Thomas
edf94c915e
Merge pull request #47775 from gtmanfred/2017.7.6
...
catch UnsupportedOperation with AssertionError
2018-05-22 15:04:12 -04:00
Daniel Wallace
548f65d056
catch UnsupportedOperation with AssertionError
2018-05-22 12:43:16 -05:00
rallytime
17596f3025
Merge branch '2017.7.6' into '2017.7'
...
No conflicts.
2018-05-22 11:26:44 -04:00
Nicole Thomas
8c38ecd75f
Merge pull request #47769 from gtmanfred/2017.7.6
...
skip test that breaks test suite
2018-05-22 11:12:53 -04:00
Nicole Thomas
17c4c8443c
Merge pull request #47430 from baniobloom/vpc_association_not_found
...
Add catch for VPCAssociationNotFound
2018-05-22 10:54:00 -04:00
Nicole Thomas
9c5dde1449
Merge pull request #47525 from baniobloom/duplicate_sec_group_rule
...
Trying to add a duplicate sec group rule true
2018-05-22 10:51:08 -04:00
Frode Gundersen
7c9b0bda33
add win_servermanager.list_available test
2018-05-22 14:43:11 +00:00
Daniel Wallace
536ce2fa42
Merge pull request #47772 from gtmanfred/2017.7
...
lock down dependencies for kitchen-salt
2018-05-22 09:21:48 -05:00
Daniel Wallace
67756a50fd
lock down dependencies for kitchen-salt
2018-05-22 09:20:29 -05:00
Nicole Thomas
12b330f049
Merge pull request #47749 from terminalmage/issue47717
...
Fix "dnf list upgrades" parsing
2018-05-22 08:51:28 -04:00
Pablo Suárez Hernández
4475ba19b8
Prevent zypper from parsing repo configuration from not .repo files
2018-05-22 12:04:48 +01:00
Daniel Wallace
3fdfc0fa82
skip test that breaks test suite
2018-05-21 17:42:35 -05:00
Daniel Wozniak
5cd18b9e70
Merge pull request #47755 from dwoz/winrmtests
...
Be explicit about winrm setting
2018-05-21 15:39:23 -07:00
Daniel A. Wozniak
57dd89e6c3
Default to ec2 classic compatible images
2018-05-21 15:01:27 -07:00
