rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- doc/ref/configuration/minion.rst
- doc/topics/thorium/index.rst
- salt/beacons/__init__.py
- salt/client/mixins.py
- salt/client/ssh/wrapper/state.py
- salt/daemons/masterapi.py
- salt/grains/extra.py
- salt/minion.py
- salt/modules/cron.py
- salt/modules/file.py
- salt/modules/mac_user.py
- salt/modules/napalm_network.py
- salt/modules/state.py
- salt/modules/win_file.py
- salt/modules/win_pkg.py
- salt/proxy/dummy.py
- salt/state.py
- salt/states/file.py
- salt/states/lxc.py
- salt/utils/__init__.py
- salt/utils/schedule.py
- tests/integration/modules/test_file.py
- tests/integration/modules/test_groupadd.py
- tests/integration/ssh/test_state.py
- tests/integration/states/test_file.py
- tests/unit/daemons/test_masterapi.py
- tests/unit/grains/test_core.py
- tests/unit/modules/test_disk.py
- tests/unit/modules/test_napalm_network.py
- tests/unit/modules/test_state.py
- tests/unit/test_minion.py
- tests/unit/utils/test_process.py
2017-12-11 18:24:41 -05:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/cli/daemons.py
- salt/client/ssh/__init__.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/proxy/fx2.py
- salt/utils/__init__.py
- salt/utils/jinja.py
- salt/utils/napalm.py
- salt/utils/path.py
- salt/utils/verify.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_service.py
- tests/unit/utils/test_verify.py
2017-11-22 12:36:03 -05:00
Daniel Wallace
a2af3cb857
Include client mixin globals in scheduler for runner modules
...
These things are included in the runners modules from the RunnerClient,
but do not get included by the loader, and need to be made available explicitly
when the modules are being run by the scheduler.
2017-11-16 09:29:55 -07:00
Daniel Wallace
3e04d2d44c
use kitchen-sync for copying files
2017-11-14 11:39:44 -07:00
Daniel Wallace
9bc70fd31b
back up to 2017.7.1 for kitchen tests
...
Until https://github.com/saltstack/salt/pull/44016 is included centos tests need to use 2017.7.1, otherwise it is unable to download the busybox binary.
2017-11-14 11:39:09 -07:00
Daniel Wallace
3b93ea058b
ubuntu 14 and centos 6 should not have py3 tests
2017-11-13 15:53:09 -07:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .kitchen.yml
- tests/unit/test_doc.py
- tests/unit/utils/test_cloud.py
2017-11-13 12:27:59 -05:00
Daniel Wallace
a83e9d892d
update kitchen yaml to use master for salt-jenkins
2017-11-10 09:40:07 -07:00
rallytime
edbbd5fc2b
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- .kitchen.yml
- salt/modules/win_system.py
2017-11-05 20:56:44 -07:00
Daniel Wallace
b65f4ea4ea
switch salt-jenkins over to saltstack
2017-11-02 10:29:45 -06:00
Daniel Wallace
cf71e3d9f2
update salt-jenkins repo to 2017.7
2017-10-30 15:29:00 -06:00
Daniel Wallace
79b8b2d0bf
remove binding
...
With binding, the rendered template is not returned to stdout (into the template).
2017-10-30 14:46:42 -06:00
Daniel Wallace
bf577c3d8b
remove binding
...
With binding, the rendered template is not returned to stdout (into the template).
2017-10-30 14:46:15 -06:00
Daniel Wallace
ec24fbc0c2
render template files platforms.yml and driver.yml
2017-10-30 13:53:51 -06:00
Daniel Wallace
c50508f0b7
render template files platforms.yml and driver.yml
2017-10-30 13:52:20 -06:00
Daniel Wallace
39262b625e
update .kitchen.yml to run py3 tests too
2017-10-27 10:31:45 -06:00
Daniel Wallace
392fd4f837
try newest salttesting
2017-10-24 09:23:46 -06:00
Daniel Wallace
10e309a64f
which vagrant should go to stderr
2017-10-24 09:23:46 -06:00
Daniel Wallace
9307564de0
fix output columns
2017-10-24 09:23:46 -06:00
Daniel Wallace
2da22f87e1
test opennebula
2017-10-24 09:23:46 -06:00
Daniel Wallace
7465f9b27a
add script for copying back artifacts
2017-10-24 09:23:46 -06:00
Daniel Wallace
255118cfd7
run tests with kitchen
2017-10-24 09:23:44 -06:00
