Commit Graph

86622 Commits

Author SHA1 Message Date
Nicole Thomas
52ab2c0574
Merge pull request #49466 from rallytime/bp-49461
Back-port #49461 to 2017.7.8
2018-08-31 11:44:10 -04:00
Daniel Wallace
58428003b1
Revert "Allow for not being prompted to supply a password to deploy keys to a…" 2018-08-31 09:57:46 -04:00
Megan Wilhite
1bbe7df6c4
Merge pull request #49284 from twangboy/fix_installer_osx
Fix path to libsodium tarball
2018-08-23 13:19:24 -04:00
twangboy
a112eaa597
Fix path to libsodium tarball 2018-08-23 10:15:28 -06:00
Daniel Wallace
e0e8779985
Merge pull request #49272 from twangboy/fix_installer_more
Add 64 bit binaries for KB2999226 to the x86 installer
2018-08-23 09:27:09 -05:00
twangboy
a8f054b2d2
Add 64bit binaries for KB2999226 to the x86 installer
Fix logic where it detects the Architecture of the system running the
installer instead of the one building the installer
Add a 3 seconds pause to actually see the error code if it throws one
2018-08-22 22:34:50 -06:00
Daniel Wozniak
0eb6ddf0e8
Merge pull request #49218 from twangboy/fix_installer
Fix Windows and OSX installers
2018-08-20 18:10:29 -07:00
twangboy
e8a1d2f772
Add more descriptive error when KB not found 2018-08-20 17:04:10 -06:00
twangboy
71737ea687
Suppress all ui on vcredist installation 2018-08-20 16:48:39 -06:00
twangboy
7dae9bb2a1
Fix Windows and OSX installers
Adds support to Universal Runtime Libraries (UCRT) for Windows
Adds futures to the req.txt for OSX
2018-08-20 16:11:34 -06:00
Nicole Thomas
e484f261ee
Merge pull request #49116 from twangboy/fix_installer
Fix windows installer script
2018-08-14 13:09:34 -04:00
twangboy
1227095c5d
Add nonfatal switch to VCRedist 2018-08-14 10:21:18 -06:00
Nicole Thomas
0b9f2f8884
Merge pull request #49113 from Ch3LL/rn_7.8
Add changelog to 2017.7.8 release notes
2018-08-14 11:03:15 -04:00
Ch3LL
f6b70bb653
Add changelog to 2017.7.8 release notes 2018-08-14 10:11:45 -04:00
Nicole Thomas
01cf2c71ff
Merge pull request #49051 from rallytime/bp-49046
Back-port #49046 to 2017.7.8
2018-08-10 13:19:17 -04:00
Gareth J. Greenaway
fc0817cb35
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-10 09:14:49 -04:00
Nicole Thomas
189e28691f
Merge pull request #49044 from Ch3LL/vultr_test
increase timeout on vultr cloud integration test
2018-08-09 21:28:16 -04:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test 2018-08-09 17:33:56 -04:00
Nicole Thomas
c606a32cf2
Merge pull request #49042 from rallytime/flaky-jinja-test
Mark a jinja template test as flaky
2018-08-09 17:05:53 -04:00
Nicole Thomas
6415b6f73b
Merge pull request #49041 from Ch3LL/ec2_fix
[2017.7.8] backport PR #48212
2018-08-09 17:05:26 -04:00
rallytime
a43d9b4ba6
Mark a jinja template test as flaky
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
2018-08-09 15:51:34 -04:00
Ch3LL
cf7f2459b8
[2017.7.8] backport PR #48212 2018-08-09 15:47:39 -04:00
Nicole Thomas
1db036406b
Merge pull request #49030 from rallytime/update-client-tests
Update netapi client tests
2018-08-09 13:11:14 -04:00
rallytime
f08ee6c6ae
Update netapi client tests
This change does 2 things:
- Skip 2 tests: they are not actually _testing_ anything, just running functions
  Let's skip these for now until we can dedicate some time to investigate what
  should be tested here. This will also help the tests breath a little bit.
- Add a small sleep to the async test. This test needs a little breathing room so
  the procs don't get stepped on. I think this is what is causing the master to
  shut down sometimes during test runs:

```
08:41:47          test_wheel_async (integration.netapi.test_client.NetapiClientTest)
08:41:47        [CPU:0.0%|MEM:13.2%]  ... 12:41:47,280 [salt.utils.process                         :670 ][ERROR   ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught:
08:41:47        Traceback (most recent call last):
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
08:41:47        Process SignalHandlingMultiprocessingProcess-24:
08:41:47        Traceback (most recent call last):
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap
08:41:47            self.run()
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
```
2018-08-09 10:11:20 -04:00
Nicole Thomas
f73ba21bc7
Merge pull request #49024 from rallytime/fix-deb-test
Fix test error in test_compiler jinja check
2018-08-09 08:43:22 -04:00
rallytime
a9c16d9137
Fix test error in test_compiler jinja check
The fix in #49002 was incomplete and when run on Debian, it hits a
`ValueError` when the RELEASE variable is a string with a decimal.
This change fixes the error.
2018-08-08 18:29:14 -04:00
Nicole Thomas
6b6d68c615
Merge pull request #49020 from rallytime/fix-grains-test
Make grains integration test more robust
2018-08-08 16:59:18 -04:00
Nicole Thomas
92d6c25c7f
Merge pull request #49002 from rallytime/skip-jinja-deep-error-test
Skip test_jinja_deep_error on Debian 8
2018-08-08 15:18:38 -04:00
rallytime
f72a3ac6be
Make grains integration test more robust
The `test_grains_append_val_already_present` test can be flaky, especially on
CentOS 7 when it gets bogged down. Let's give the test a little breathing room
by adding a sleep so the grains.append calls don't stack up too quickly.
2018-08-08 14:58:05 -04:00
Nicole Thomas
41d9f11eb3
Merge pull request #48999 from rallytime/fix-boto-test
Update expected return value in boto test
2018-08-08 10:42:14 -04:00
rallytime
23b66ef8bb
Skip test_jinja_deep_error on Debian 8
This is a flaky test on Debian 8, so let's skip it for now.
2018-08-08 10:36:56 -04:00
rallytime
d0136b1be5
Update expected return value in boto test
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
2018-08-08 09:16:55 -04:00
Nicole Thomas
a1e54634dc
Merge pull request #48976 from rallytime/tornado
Skip unreliable tornado tests
2018-08-07 14:55:24 -04:00
Nicole Thomas
22713be9c1
Merge pull request #48979 from rallytime/bp-48959
Back-port #48959 to 2017.7.8
2018-08-07 14:11:52 -04:00
rallytime
0bd838ab6c
Skip unreliable tornado tests
Marked as flaky originally, but they're still flaky with undetermined
race-conditions. These are skipped in 2018.3 and forward, so let's skip
them here as well.
2018-08-07 11:22:18 -04:00
Nicole Thomas
03aa0e49b0
Merge pull request #48970 from Ch3LL/back_48962
[2017.7.8] Backport #48962
2018-08-07 11:01:56 -04:00
Nicole Thomas
e6cea5e3c7
Merge pull request #48968 from rallytime/man-pages
Update man pages for 2017.7.8 release
2018-08-07 10:29:07 -04:00
Gareth J. Greenaway
3ce1b8a3c9
Update the elif block to only be true for versions below Debian 9. 2018-08-07 09:58:40 -04:00
rallytime
64fe3be41a
Update man pages for 2017.7.8 release 2018-08-07 09:35:01 -04:00
rallytime
aaf986d728
Mark one grains test as flaky & convert to pytest notation 2018-08-06 15:03:27 -04:00
rallytime
e7e5abcf48
Mark 2 matcher tests as flaky 2018-08-06 14:47:44 -04:00
Nicole Thomas
848d583438
Merge pull request #48950 from KaiSforza/kitchenfix-2017.7
Added a quote to kitchen Jenkinsfiles
2018-08-06 10:29:07 -04:00
William Giokas
5242cb143a
Added a quote to kitchen Jenkinsfiles
Kitchen wasn't running correctly
2018-08-06 08:25:25 -06:00
Nicole Thomas
928d688d65
Merge pull request #48943 from rallytime/flaky-tests
Mark some shell and runner integration tests as flaky
2018-08-06 09:08:13 -04:00
Daniel Wallace
cd42510d3a
Merge pull request #48940 from rallytime/bp-48852
Back-port #48852 to 2017.7
2018-08-05 16:32:26 -05:00
rallytime
668da57ab9
Mark some shell and runner integration tests as flaky
In addition to marking these tests as flaky, the commit also updates
the affected tests to use pytest notation instead of unittest notation.
2018-08-05 16:19:29 -04:00
William Giokas
fa4ef92e79
Record all the artifacts from the build 2018-08-05 15:53:18 -04:00
Nicole Thomas
43649a68be
Merge pull request #48935 from garethgreenaway/1045_test_pkg_015_installed_held_centos
[2017.7] Fix to test_pkg.test_pkg_015_installed_held
2018-08-05 15:47:38 -04:00
Nicole Thomas
2421e2a570
Merge pull request #47100 from gtmanfred/ssh
Allow for not being prompted to supply a password to deploy keys to a…
2018-08-05 15:12:57 -04:00
Nicole Thomas
d541bd6446
Merge pull request #48891 from damon-atkins/2017.7_win_pkg.list_pkgs_not_found
win_pkg: Fix issue introduced in Jan 2018 DisplayVersion missing should result…
2018-08-05 14:53:46 -04:00