From 4cf2808840cc8701347b81018ad41603c534cc0b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 14 Jan 2022 11:24:40 +0000 Subject: [PATCH] ci(kitchen): use `cron-formula` dependency instead of `cron` state * Semi-automated using https://github.com/myii/ssf-formula/pull/401 --- kitchen.yml | 8 ++++---- logrotate/config.sls | 1 - test/salt/states/cron.sls | 4 ---- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 test/salt/states/cron.sls diff --git a/kitchen.yml b/kitchen.yml index 2273dbf..4370902 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -467,14 +467,14 @@ suites: - name: default provisioner: dependencies: - - name: states - path: ./test/salt + - name: cron + repo: git + source: https://github.com/saltstack-formulas/cron-formula.git state_top: base: - 'G@os_family:Suse or G@os_family:Debian': - - states.cron '*': - logrotate._mapdata + - cron - logrotate pillars: top.sls: diff --git a/logrotate/config.sls b/logrotate/config.sls index 37da712..5e4e3c1 100644 --- a/logrotate/config.sls +++ b/logrotate/config.sls @@ -4,7 +4,6 @@ include: - logrotate {% set ns = namespace(hourly=False) %} -{% set jobs = salt['config.get']('logrotate:jobs', {}) %} {% for key, value in logrotate.jobs.items() %} {% set contents = value.get('contents', False) %} {% if 'hourly' in (contents or value.config) %} diff --git a/test/salt/states/cron.sls b/test/salt/states/cron.sls deleted file mode 100644 index 1570f2f..0000000 --- a/test/salt/states/cron.sls +++ /dev/null @@ -1,4 +0,0 @@ - -cron_package: - pkg.installed: - - name: cron