Merge branch 'ci-update' into 'master'

Update the CI tests

See merge request shared-puppet-modules-group/tor!18

3 files changed, 0 insertions, 49 deletions

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index f09ad62..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    image: debian:8
-    hypervisor: docker
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get install -y wget locales-all puppet git'
-      - 'rm -f /usr/sbin/policy-rc.d'
-
-CONFIG:
-  type: foss
-  #log_level: verbose
-  #log_level: debug
-
-ssh:
-  password: root
-  auth_methods: ["password"]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
deleted file mode 100644
index 3cca63a..0000000
--- a/spec/spec_helper.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# https://puppetlabs.com/blog/testing-modules-in-the-puppet-forge
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |c|
-
-  c.manifest_dir = File.join(fixture_path, 'manifests')
-  c.module_path  = File.join(fixture_path, 'modules')
-
-  c.color = true
-end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
deleted file mode 100644
index e6a2cd8..0000000
--- a/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'beaker-rspec'
-
-RSpec.configure do |c|
-  module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  module_name = module_root.split('-').last
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => module_root, :module_name => module_name)
-    hosts.each do |host|
-      shell('git clone https://github.com/puppetlabs/puppetlabs-concat.git /etc/puppet/modules/concat')
-    end
-  end
-end