From 34a980588603bc8a5720b8820754e96108cb505d Mon Sep 17 00:00:00 2001 From: lagooj Date: Wed, 11 Nov 2020 14:23:27 +0100 Subject: [PATCH] test(archive): update test according to defaults.yaml changes --- test/integration/default/controls/archive_spec.rb | 12 ++++++------ test/salt/pillar/default.sls | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/test/integration/default/controls/archive_spec.rb b/test/integration/default/controls/archive_spec.rb index 613307f..24edf10 100644 --- a/test/integration/default/controls/archive_spec.rb +++ b/test/integration/default/controls/archive_spec.rb @@ -38,11 +38,11 @@ control 'prometheus components' do describe directory('/var/lib/prometheus') do it { should exist } end - describe directory('/opt/prometheus/prometheus-v2.10.0') do + describe directory('/opt/prometheus/prometheus-v2.22.1') do it { should exist } its('group') { should eq 'root' } end - describe file('/opt/prometheus/prometheus-v2.10.0/prometheus') do + describe file('/opt/prometheus/prometheus-v2.22.1/prometheus') do it { should exist } its('group') { should eq 'root' } end @@ -55,11 +55,11 @@ control 'prometheus components' do its('group') { should eq 'root' } its('mode') { should cmp '0644' } end - describe directory('/opt/prometheus/alertmanager-v0.17.0') do + describe directory('/opt/prometheus/alertmanager-v0.21.0') do it { should exist } its('group') { should eq 'root' } end - describe file('/opt/prometheus/alertmanager-v0.17.0/amtool') do + describe file('/opt/prometheus/alertmanager-v0.21.0/amtool') do it { should exist } its('group') { should eq 'root' } end @@ -72,11 +72,11 @@ control 'prometheus components' do its('group') { should eq 'root' } its('mode') { should cmp '0644' } end - describe directory('/opt/prometheus/node_exporter-v0.18.1') do + describe directory('/opt/prometheus/node_exporter-v1.0.1') do it { should exist } its('group') { should eq 'root' } end - describe file('/opt/prometheus/node_exporter-v0.18.1/node_exporter') do + describe file('/opt/prometheus/node_exporter-v1.0.1/node_exporter') do it { should exist } its('group') { should eq 'root' } end diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index f481219..2f8e3e7 100644 --- a/test/salt/pillar/default.sls +++ b/test/salt/pillar/default.sls @@ -82,9 +82,6 @@ prometheus: - to: 'team-X+alerts@example.org' node_exporter: - version: v0.18.1 - archive: - source_hash: b2503fd932f85f4e5baf161268854bf5d22001869b84f00fd2d1f57b51b72424 service: args: web.listen-address: ":9110" @@ -94,7 +91,7 @@ prometheus: service: args: web.listen-address: ":9115" - config_file: /opt/prometheus/blackbox_exporter-v0.14.0/blackbox.yml + config_file: /opt/prometheus/blackbox_exporter-v0.18.0/blackbox.yml consul_exporter: service: