Commit Graph

101499 Commits

Author SHA1 Message Date
Daniel Wozniak
6b800a2b91 Merge pull request #53389 from bryceml/2019.2.1
only keep last 10 builds of every pr on jenkins to reduce disk usage
2019-06-10 10:18:46 -07:00
Bryce Larson
05368a124b
Merge branch '2019.2.1' into 2019.2.1 2019-06-10 11:13:28 -06:00
Daniel Wozniak
fe18c40731
Merge pull request #53332 from s0undt3ch/hotfix/full-test-run-2019.2.1
Non optional full test runs for 2019.2.1
2019-06-10 08:51:40 -07:00
Gareth J. Greenaway
237273339f
Merge branch '2019.2.1' into hotfix/full-test-run-2019.2.1 2019-06-10 08:46:05 -07:00
Bryce Larson
928b05f863
only fetch pr target branch instead of all branches to save time and disk space 2019-06-09 16:41:29 -06:00
Bryce Larson
ccc61060a0
only keep last 10 builds of every pr on jenkins to reduce disk usage 2019-06-08 11:27:01 -06:00
Shane Lee
d0810d78ad
Merge pull request #53287 from twangboy/fix_win_system
Fix win system
2019-06-06 17:35:46 -06:00
Akmod
477cd20cd4
Check dir_mode recursively in file.directory (#53385)
* Created a test case

* Fix states.file checking directory permissions recursively

A change was introduced in 79f6b426ff (PR #50653) to check the file
mode recursively. This change introduced a variable shadow that
caused directory permission checking to fail.

* Rename mode variable to dir_mode for clarity

* Revert "Created a test case"

This reverts commit 26fd01aa9382027415883e79c133b168a9a57cb3.

* Re-added test case without irrelevant cosmetic code changes

* Send string instead of integer - normalize values before comparison
2019-06-06 17:11:00 -06:00
Gareth J. Greenaway
cf98b83aad
Merge pull request #53386 from dwoz/missing_import
Fix missing import
2019-06-06 13:45:58 -07:00
FireGrace
894f171430 change .next() to next() py2=>py3 leftover (#53240) 2019-06-06 12:04:29 -06:00
Megan Wilhite
18991f98eb
Merge pull request #53323 from dmurphy18/fix_53274
Fix for issue #53274, test on Amazon Linux 1
2019-06-06 13:31:17 -04:00
Daniel A. Wozniak
a23d6d90ef
Fix missing import 2019-06-05 14:47:06 -07:00
Akmod
1c3667a3ac
Updated paramiko to version 2.2.3 for python3.7 support (#53356)
* Updated paramiko to version 2.2.3 for python3.7 support

* Handle nox running under Py2 and Py3

* Stop compiling static TCP requirements.

* Fix Amazon 2018.03 in excludes

* Compile requirements files
2019-06-05 12:07:28 -06:00
twangboy
0fc88fb437
Add TypeError 2019-06-05 10:39:25 -06:00
twangboy
5b4160d122
Try NumberOfEnabledCores
Use a try/except block instead of comparing versions
2019-06-05 10:39:25 -06:00
twangboy
49cbfd4fe3
Add a note about skipping unavailable items 2019-06-05 10:39:25 -06:00
twangboy
044b56b7a6
Fix get_system_info for older versions of Windows
Skip processor_cores_enabled as it's not available
Get ChassisSKUNumber using the ComputerSystemProduct class
2019-06-05 10:39:24 -06:00
David Murphy
6814852d48
Merge branch '2019.2.1' into fix_53274 2019-06-05 09:31:12 -06:00
Pedro Algarvio
f8bd47b684
Merge branch '2019.2.1' into hotfix/full-test-run-2019.2.1 2019-06-05 11:35:09 +01:00
Pedro Algarvio
1cf57e9418
Merge pull request #53273 from s0undt3ch/hotfix/py3-nox-docs-2019.2.1
[2019.2.1] Switch docs building under Py3
2019-06-05 11:01:02 +01:00
Pedro Algarvio
dfd36a277f
Merge pull request #53361 from s0undt3ch/hotfix/fix-mp-logging-2019.2.1
[2019.2.1] Only make a new log record if it's a dictionary.
2019-06-05 10:56:14 +01:00
David Murphy
bb6c97a4f2
Merge branch '2019.2.1' into fix_53274 2019-06-04 15:15:58 -06:00
Wayne Werner
5efb670404
Merge pull request #53351 from waynew/53171-fix-network-managed
Add checks for Amazon Linux to ip module
2019-06-04 14:25:56 -05:00
Wayne Werner
e801afe3e5
Add checks for Amazon Linux to ip module
Fixes #53171
2019-06-04 10:49:53 -05:00
Pedro Algarvio
d70d61fc8b
Fully revert 962b11687 2019-06-04 16:46:06 +01:00
Shane Lee
ce5d79adce
Merge pull request #53242 from s0undt3ch/hotfix/msgpack-ipc-2019.2.1
[2019.2.1] newer msgpack ipc fixes
2019-06-03 17:39:08 -06:00
Shane Lee
d27a524eb8
Merge branch '2019.2.1' into hotfix/msgpack-ipc-2019.2.1 2019-06-03 16:03:05 -06:00
David Murphy
b84833de45
Merge branch '2019.2.1' into fix_53274 2019-06-03 09:28:06 -06:00
Charles McMarrow
df448c20ed
Merge pull request #53289 from cmcmarrow/test_kubernetes_lint_failures_silenced
stops pylint E1120 from showing
No code was add it. Just fixing pylint warrnings
2019-06-01 04:57:26 +00:00
David Murphy
7085f36764 Fixed pylint issue on PR not showing when run pylint locally 2019-05-31 18:03:00 -06:00
David Murphy
1200031263 Updated to use package bash-doc if Amazon Linux 1 after review comments 2019-05-31 17:17:11 -06:00
David Murphy
b2a4a5e63f Fix for issue #53274, test on Amazon Linux 1 2019-05-31 17:05:59 -06:00
Gareth J. Greenaway
03eacac94c
Merge branch '2019.2.1' into test_kubernetes_lint_failures_silenced 2019-05-31 13:49:21 -07:00
Pedro Algarvio
45c3c066ae
Non optional full test runs for 2019.2.1 2019-05-31 18:57:47 +01:00
cmcmarrow
f93e7d34c7
stops pylint E1120 from showing 2019-05-31 17:54:51 +00:00
cmcmarrow
cbe6423a11
stops pylint E1120 from showing 2019-05-31 17:30:52 +00:00
Pedro Algarvio
6fac22b7c9
Merge pull request #53304 from s0undt3ch/hotfix/jenkins-pipelines-refactor-2019.2.1
[2019.2.1] Refactor Jenkins PR pipelines to download artifacts after timeout
2019-05-31 18:10:19 +01:00
Pedro Algarvio
d359513ffc
Merge pull request #53297 from s0undt3ch/hotfix/tcp-transport-tests
[2019.2.1] The TCP transport needs the exact same requirements as the ZeroMQ one
2019-05-30 20:42:28 +01:00
Pedro Algarvio
6e778efc8e
Refactor Jenkins PR pipelines to download artifacts after timeout 2019-05-29 14:24:42 +01:00
Pedro Algarvio
bec7fa5521
The TCP transport needs the exact same requirements as the ZeroMQ one
```
10:38:21          test_down (integration.runners.test_manage.ManageTest) ... 09:37:29,619 [salt.minion                                               :3064][CRITICAL] Unexpected error while connecting to localhost
10:38:21        Traceback (most recent call last):
10:38:21          File "/tmp/kitchen/testing/salt/minion.py", line 3036, in _connect_syndic
10:38:21            yield syndic.connect_master(failed=failed)
10:38:21          File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-tcp/lib/python2.7/site-packages/tornado/gen.py", line 1055, in run
10:38:21            value = future.result()
10:38:21          File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-tcp/lib/python2.7/site-packages/tornado/concurrent.py", line 238, in result
10:38:21            raise_exc_info(self._exc_info)
10:38:21          File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-tcp/lib/python2.7/site-packages/tornado/gen.py", line 1063, in run
10:38:21            yielded = self.gen.throw(*exc_info)
10:38:21          File "/tmp/kitchen/testing/salt/minion.py", line 1218, in connect_master
10:38:21            master, self.pub_channel = yield self.eval_master(self.opts, self.timeout, self.safe, failed)
10:38:21          File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-tcp/lib/python2.7/site-packages/tornado/gen.py", line 1055, in run
10:38:21            value = future.result()
10:38:21          File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-tcp/lib/python2.7/site-packages/tornado/concurrent.py", line 238, in result
10:38:21            raise_exc_info(self._exc_info)
10:38:21          File "/tmp/kitchen/testing/.nox/runtests-parametrized-2-7-coverage-true-crypto-none-transport-tcp/lib/python2.7/site-packages/tornado/gen.py", line 307, in wrapper
10:38:21            yielded = next(result)
10:38:21          File "/tmp/kitchen/testing/salt/minion.py", line 713, in eval_master
10:38:21            pub_channel = salt.transport.client.AsyncPubChannel.factory(self.opts, **factory_kwargs)
10:38:21          File "/tmp/kitchen/testing/salt/transport/client.py", line 161, in factory
10:38:21            import salt.transport.zeromq
10:38:21          File "/tmp/kitchen/testing/salt/transport/zeromq.py", line 41, in <module>
10:38:21            import zmq.error
10:38:21        ImportError: No module named zmq.error
```
2019-05-29 13:10:46 +01:00
Pedro Algarvio
98653c068d
Allow docs to be built on Python >= 3.5, not just Python 3.6 2019-05-29 11:42:12 +01:00
Pedro Algarvio
c54f06f085
Have sphinx turn errors into warnings 2019-05-29 11:42:04 +01:00
Pedro Algarvio
07f432796c
Switch docs building under Py3
Refs #53137
2019-05-29 11:42:01 +01:00
Pedro Algarvio
50e31ecf0b
Merge pull request #53264 from s0undt3ch/2019.2.1
[2019.2.1] Minion blackout tests - Add the missing, and required, top pillar file
2019-05-29 08:30:44 +01:00
cmcmarrow
c5a5d43619
test_kubernetes_lint_failures_silenced 2019-05-28 22:40:59 +00:00
cmcmarrow
b8383956d4
test_kubernetes_lint_failures_silenced 2019-05-28 22:35:10 +00:00
cmcmarrow
997d0a814d
stops pylint E1120 from showing 2019-05-28 21:36:19 +00:00
Megan Wilhite
acabb70238
Merge branch '2019.2.1' into 2019.2.1 2019-05-28 15:28:51 -04:00
Daniel Wozniak
749c6265b3
Merge pull request #52966 from s0undt3ch/hotfix/full-test-run
Always run the full test suite on the 2019.2.1 release branch
2019-05-28 08:43:10 -07:00
Pedro Algarvio
247c46162e
Always run the full test suite on the 2019.2.1 release branch 2019-05-28 16:38:27 +01:00