Nicole Thomas
b805bab25c
Merge pull request #50308 from rallytime/test-fixes
...
Fix matcher grain file
2018-10-30 11:27:46 -04:00
rallytime
f23852207f
Fix matcher grain file
...
This was inadvertently changed in th filename_map backport.
This commit restores the matcher grain file to match all branches previous
to the inadvertent change.
2018-10-30 09:51:51 -04:00
Nicole Thomas
57fe6cdb18
Merge pull request #50270 from terrible-broom/feature/apt-cache-show-instead-of-dump
...
apt: speedup installing packages with '>=' or '<=' and reduced memory…
2018-10-30 09:24:35 -04:00
Nicole Thomas
6c1b05ad9e
Lint: add extra blank line
2018-10-30 09:22:24 -04:00
Daniel Wallace
6a65402dac
Merge pull request #50293 from saltstack/jenkins
...
update jenkins version for 2018.3
2018-10-29 18:39:34 -05:00
Daniel Wallace
935f1815a2
Merge pull request #50289 from gtmanfred/2018.3
...
ignore empty line in localectl status output
2018-10-29 16:39:06 -05:00
Daniel Wallace
fe6fbc43d7
update jenkins version for 2018.3
2018-10-29 16:05:34 -05:00
Anna Martynova
a4df706d1d
fix review notes
2018-10-29 23:57:07 +03:00
Daniel Wallace
fb43061cb1
fix test
2018-10-29 14:45:23 -05:00
Daniel Wallace
5eb0e37f4e
add extra space to localemod test
2018-10-29 14:31:36 -05:00
Daniel Wallace
e8dc8baf71
if line in output of localectl is empty, ignore it
2018-10-29 14:29:14 -05:00
Nicole Thomas
10ba8b42a8
Merge pull request #50276 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-10-29 15:05:14 -04:00
Nicole Thomas
0f1dc08d41
Merge pull request #50282 from twangboy/fix_test_diskusage
...
Fix `unit.beacons.test_diskusage` on Windows
2018-10-29 14:37:12 -04:00
twangboy
fd369dd115
Mock is_windows = False
2018-10-29 10:25:56 -06:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050
...
Backport runtests.py modifications from develop to 2018.3
2018-10-29 12:25:06 -04:00
rallytime
f05abb09de
Merge branch '2017.7' into '2018.3'
2018-10-29 11:22:36 -04:00
Nicole Thomas
6ae8a33ced
Merge pull request #50281 from dubb-b/add_subnet
...
Add subnet
2018-10-29 11:20:12 -04:00
Nicole Thomas
4fdcf7c4a7
Lint: Add extra blank line
2018-10-29 11:17:12 -04:00
Brett Benassi
cebfd8ad03
Fixing lint error
2018-10-29 09:08:48 -06:00
rallytime
113d76e045
Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests"
...
This reverts commit 6d9c2eb6b0
2018-10-29 11:05:33 -04:00
Brett Benassi
0da6301d5a
Merge branch '2017.7' of https://github.com/saltstack/salt into add_subnet
2018-10-29 08:58:05 -06:00
Brett Benassi
2df611565a
Adding subnetID so it knows the right VPC to build the node in.
2018-10-29 08:57:22 -06:00
rallytime
3057ca4b0b
Lint fix: add extra blank line in core.py
2018-10-29 10:46:46 -04:00
rallytime
8968f9d164
Revert "Rename test_map_conf test file to respect naming convention"
...
This reverts commit 8326a09921
2018-10-29 10:46:29 -04:00
rallytime
85a9395c2a
Remove saltclass pillar unit test for list expansion
...
This test only applies to functionality present in Fluorine or newer.
This commit will need to be reverted again in the fluorine branch.
2018-10-29 10:34:24 -04:00
rallytime
3d95673be0
Use get_config_dir() instead of self.config_dir
...
This attribute does not exist in the 2018.3 branch. Use the function
for now, and then change this back on the merge-forward.
2018-10-29 10:23:00 -04:00
rallytime
e8b3a62b31
Add init file back in for unit/client pkg
...
This file was accidentally removed during some test renaming. The absence
of this file prevents the test from running due to an ImportError.
2018-10-29 10:19:52 -04:00
rallytime
a0cfbdcb79
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-10-29 09:55:06 -04:00
Nicole Thomas
1e8b092256
Merge pull request #50267 from m03/fix-aptly-config-paths-20183
...
Fix missing aptly config paths
2018-10-29 09:27:22 -04:00
Anna Martynova
d059edd45f
apt: speedup installing packages with '>=' or '<=' and reduced memory consumption
2018-10-29 13:53:35 +03:00
m03
319bb31944
Fix missing aptly config paths
2018-10-28 11:32:45 -07:00
Daniel Wallace
b94a43b09e
Merge pull request #50184 from ethanculler/fix-minion-return-exception-with-return
...
Added handling for minion return exceptions containing the word "return"
2018-10-26 19:16:56 -05:00
Daniel Wallace
6b009b4290
Merge pull request #50258 from dubb-b/fix_cloud_ec2
...
Adding securitygroupname as the config instead of securitygroup
2018-10-26 18:03:06 -05:00
Brett Benassi
6a1e9f0a7f
Adding securitygroupname as the config instead of securitygroup
2018-10-26 15:38:48 -06:00
Daniel Wallace
3e1aac9dad
Merge pull request #50251 from gtmanfred/2017.7
...
bump salt version to 2017.7.8 for test bootstrapping
2018-10-26 15:54:50 -05:00
Cédric Bosdonnat
d527dd29cc
Rename states/test_libvirt.py into states/test_virt.py
...
Modules test files are named after the module itself, the state virt
module needs to comply with that rule too.
2018-10-26 16:05:03 -04:00
rallytime
ab4a670ff2
Remove pgjsonb returner unit tests
...
The tests that are written in this file are for functions not present
in the 2018.3 branch.
This commit will need to be reverted in the merge-forward to `fluorine`.
2018-10-26 15:58:46 -04:00
rallytime
68ab3eef55
Remove "test_custom" from grains section of filename_map
...
This test is for functionality only available in fluorine and newer.
Removing this for 2018.3.
2018-10-26 15:17:12 -04:00
rallytime
68146983cb
Remove test_error from scheduler tests
...
These tests are not present on 2018.3
2018-10-26 14:54:25 -04:00
rallytime
c55dcf02eb
Add init file back in for integration/cloud/clouds pkg
...
This was accdientally removed during some cloud test file renaming, which
prevents the test from running due to an ImportError
2018-10-26 14:32:03 -04:00
Daniel Wallace
061e5997cc
bump salt version to 2017.7.8
2018-10-26 12:07:48 -05:00
Nicole Thomas
fe9bc8170b
Merge pull request #50233 from Ch3LL/bp-50232
...
[2017.7] Backport #50232
2018-10-25 16:56:26 -04:00
Ch3LL
f83460da62
change order of search engine ids
2018-10-25 16:47:46 -04:00
Ch3LL
bf3f21721e
Update search engine IDs for releases
2018-10-25 16:47:41 -04:00
Megan Wilhite
ab0b022fee
Merge pull request #50232 from Ch3LL/search_latest
...
Update search engine IDs for releases
2018-10-25 16:15:06 -04:00
Nicole Thomas
1c8cdf985f
Merge pull request #50231 from saltstack/revert-50174-bp-50146
...
Revert "Back-port #50146 to 2018.3"
2018-10-25 16:12:14 -04:00
Ch3LL
3452d9bf01
change order of search engine ids
2018-10-25 16:11:35 -04:00
Ch3LL
c9546dfb08
Update search engine IDs for releases
2018-10-25 16:10:15 -04:00
Nicole Thomas
c76ac1b7b8
Revert "Back-port #50146 to 2018.3"
2018-10-25 15:55:27 -04:00
Ethan Culler-Mayeno
283d41c16c
Merge branch '2017.7' into fix-minion-return-exception-with-return
2018-10-25 09:06:41 -07:00
