Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lower test permutations #6

Merged
merged 3 commits into from
Apr 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ platforms:
run_command: /sbin/init

suites:
- name: default
provisioner:
state_top:
base:
'*':
- vault
- name: dev_server_systemd
excludes:
- amazonlinux
Expand All @@ -53,7 +47,7 @@ suites:
vault:
service:
type: systemd
- name: dev_server_upstart
- name: dev_server_upstart_s3
includes:
- amazonlinux
provisioner:
Expand All @@ -71,24 +65,6 @@ suites:
vault:
service:
type: upstart
- name: server_backend_s3
includes:
- amazonlinux
provisioner:
state_top:
base:
'*':
- vault
- vault.server
pillars:
top.sls:
base:
'*':
- vault
vault.sls:
vault:
backend:
type: s3
bucket: com-saltstack-vault
service:
type: upstart
6 changes: 0 additions & 6 deletions test/integration/default/vault_spec.rb

This file was deleted.

6 changes: 6 additions & 0 deletions test/integration/dev_server_systemd/vault_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
describe command('/usr/local/bin/vault -version') do
its(:exit_status) { should eq 0 }
its(:stderr) { should be_empty }
its(:stdout) { should match(/^Vault v[0-9\.]+ \('[0-9a-f]+'\)/) }
end

describe file('/etc/vault/config/server.hcl') do
it { should be_a_file }
expected =<<-EOF
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
describe command('/usr/local/bin/vault -version') do
its(:exit_status) { should eq 0 }
its(:stderr) { should be_empty }
its(:stdout) { should match(/^Vault v[0-9\.]+ \('[0-9a-f]+'\)/) }
end

describe file('/etc/vault/config/server.hcl') do
it { should be_a_file }
expected = <<-EOF

backend "s3" {
bucket = "com-saltstack-vault"
}
listener "tcp" {
address = "0.0.0.0:8200"
tls_disable = 0
Expand Down
36 changes: 0 additions & 36 deletions test/integration/server_backend_s3/vault_spec.rb

This file was deleted.

4 changes: 0 additions & 4 deletions vault/server.sls
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ generate self signed SSL certs:
- group: root
- mode: 755

{%- if vault.dev_mode %}
/etc/vault/config:
file.directory:
- user: root
Expand All @@ -40,7 +39,6 @@ generate self signed SSL certs:
- mode: 644
- require:
- file: /etc/vault/config
{% endif -%}

{%- if vault.service.type == 'systemd' %}
/etc/systemd/system/vault.service:
Expand Down Expand Up @@ -71,6 +69,4 @@ vault:
{%- if vault.self_signed_cert.enabled %}
- cmd: generate self signed SSL certs
{% endif -%}
{%- if vault.dev_mode %}
- file: /etc/vault/config/server.hcl
{% endif -%}