valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 00:25:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
102,663 Commits 24 Branches 182 Tags 341 MiB
master
Commit Graph

94 Commits

Author SHA1 Message Date
Bryce Larson
f3a6e2efc3
update branches for codecove and kitchen 2019-10-08 18:18:09 -06:00
Pedro Algarvio
0b6f848082
Fix docker entries 2019-05-08 13:16:36 +01:00
Pedro Algarvio
03a9601aff
Ignore .nox directory 2019-05-08 13:16:25 +01:00
Daniel A. Wozniak
49d529d2d4
Use windows state to bootstrap windows builds 
This is also removing the use of dev_*.ps1 scripts in the windows builds
 2019-03-20 09:27:42 -07:00
Ch3LL
d4e9770109
Update kitchen.yml with new 2019.2 branch 2019-01-07 15:52:31 -05:00
Brett Benassi
5d884d3d29
Fixing missing v on the bootstrap options for kitchen 2018-12-11 10:29:01 -07:00
Ch3LL
8501581f27
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/utils/mac_utils.py
  - salt/utils/win_runas.py
  - tests/support/case.py
 2018-11-14 12:38:16 -05:00
Daniel A. Wozniak
5754b4a7c6
Fix 2018.3 build 2018-11-13 11:33:26 -07:00
Brett Benassi
fb614827bd
adding git 2018-11-09 11:55:28 -07:00
Brett Benassi
181b8a429e
removing stable 2018-11-09 11:53:45 -07:00
Brett Benassi
fc93ad6ebf
Adding the released version as the bootstrap minion. 2018-11-09 11:42:59 -07:00
rallytime
77b4379a99
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/cloud/clouds/test_ec2.py
 2018-10-30 12:23:39 -04:00
Daniel Wallace
fe6fbc43d7
update jenkins version for 2018.3 2018-10-29 16:05:34 -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
rallytime
3f2712fbc1
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/unit/states/test_virt.py
  - tests/unit/test_config.py
 2018-10-29 12:36:28 -04:00
rallytime
a0cfbdcb79
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-29 09:55:06 -04:00
Daniel Wallace
061e5997cc
bump salt version to 2017.7.8 2018-10-26 12:07:48 -05:00
Daniel Wallace
f485b4afae
enable testing only filemaps 2018-10-25 11:17:03 -04:00
Daniel Wallace
3c694af952
update salt-jenkins branch to fluorine 
This should be changed back to master when forward merged to develop
 2018-08-07 09:23:28 -05:00
rallytime
a466a4880f
Merge branch '2017.7.7' into '2017.7' 
No conflicts.
 2018-07-10 16:49:13 -04:00
rallytime
bf6c788350
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/utils/thin.py
 2018-06-30 09:48:06 -04:00
Nicole Thomas
fbbafc8de4
Merge pull request #48300 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-06-30 08:58:27 -04:00
Brett Benassi
54660e8e40
Changing debug to info for logging 2018-06-28 14:48:27 -06:00
Brett Benassi
d8260b6628
Changing debug to info for logging 2018-06-28 14:46:31 -06:00
Brett Benassi
c0b962e28d
Changing debug to info for logging 2018-06-28 14:43:08 -06:00
rallytime
fface7cc74
Merge branch '2018.3.2' into '2018.3' 
Conflicts:
  - tests/integration/runners/test_state.py
 2018-06-28 10:05:18 -04:00
rallytime
6177d6e3c1
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/client/__init__.py
  - salt/grains/core.py
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_file.py
  - tests/unit/roster/test_sshconfig.py
 2018-06-25 11:26:25 -04:00
rallytime
398cc78224
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - doc/topics/releases/2017.7.6.rst
  - salt/modules/timezone.py
  - tests/support/case.py
  - tests/unit/modules/test_timezone.py
 2018-06-15 16:51:45 -04:00
Daniel Wallace
fce1c31146
bootstrap kitchen branch tests with 2017.7.6 2018-06-14 12:11:10 -05:00
Daniel Wallace
6128519e8b
bootstrap kitchen branch tests with 2017.7.6 2018-06-14 12:10:32 -05:00
Daniel Wallace
56b074ab27
allow specifying a different state to run on converge 2018-06-07 15:49:54 -05:00
Daniel Wallace
cc9c4b4d5a
add pytest coverage and xml junits 2018-06-07 12:53:22 -05:00
rallytime
cf58ae22bf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - tests/unit/utils/test_stringutils.py
 2018-05-09 11:40:54 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
Daniel Wallace
99e150e09c
check for kitchen-vagrant gem before loading windows tests 2018-05-04 09:45:53 -05:00
Daniel Wallace
d228e72477
update ubuntu-rolling to 18.04 2018-05-03 12:02:22 -05:00
Daniel Wallace
33f378a9e7
Update .kitchen.yml 
develop should have the master repo of salt-jenkins
 2018-05-03 11:48:20 -05:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00
Daniel A. Wozniak
c3941efad0
Kitchn should ignore artifacts directory 2018-04-14 00:42:04 -07:00
rallytime
ccc5bad2df
Merge branch '2017.7' into merge-2018.3 
Conflicts:
  - .kitchen.yml
 2018-04-10 10:23:02 -04:00
Daniel Wallace
98588c1dc5
use saltstack salt-jenkins 2018-04-10 09:15:50 -05:00
rallytime
2f1cf3e511
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
 2018-04-10 10:11:35 -04:00
Daniel Wallace
1f69c0d7f8
make sure windows outputs xml junit files 2018-04-09 14:43:15 -05:00
Daniel Wallace
91474878fa
don't copy __pycache__ or .pyc files for kitchen 2018-04-06 14:15:02 -05:00
Daniel Wallace
b03e272e44
windows work 2018-04-04 13:37:39 -05:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Daniel Wallace
c76f7eb028
enable debug logging on the minionlog 2018-03-15 14:29:54 -06:00
Daniel Wallace
2c39ac6dfb
disable verbose 2018-03-15 10:35:35 -06:00
Daniel Wallace
289c7a228f
retry if there is a segfault 2018-03-14 07:52:18 -04:00