summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickaël Canévet <mickael.canevet@camptocamp.com>2016-05-25 09:00:52 +0200
committerMickaël Canévet <mickael.canevet@camptocamp.com>2016-05-25 09:00:52 +0200
commit01f344c621d682168b7d19096cf6d4217af50d8e (patch)
tree74af86d162775d92e216a64d875ef785b244cab5
parentf5048ab20c2679f379a0e6f356e304fd293efbed (diff)
Speed up acceptance tests on centos-5
-rw-r--r--Gemfile1
-rw-r--r--spec/acceptance/nodesets/centos-5.yml1
-rw-r--r--spec/acceptance/nodesets/centos-6.yml1
3 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f0d7a49..df5a5e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ group :development, :unit_tests do
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'puppet-lint-file_ensure-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
- gem 'puppet-lint-fileserver-check', :require => false
gem 'puppet-lint-file_source_rights-check', :require => false
gem 'puppet-lint-alias-check', :require => false
gem 'rspec-puppet-facts', :require => false
diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml
index b7ed0e5..a26f27f 100644
--- a/spec/acceptance/nodesets/centos-5.yml
+++ b/spec/acceptance/nodesets/centos-5.yml
@@ -10,6 +10,7 @@ HOSTS:
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs tar wget which'
+ - 'sed -i -e "/mingetty/d" /etc/inittab'
CONFIG:
type: aio
log_level: debug
diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml
index c82c10d..71e23cd 100644
--- a/spec/acceptance/nodesets/centos-6.yml
+++ b/spec/acceptance/nodesets/centos-6.yml
@@ -11,6 +11,7 @@ HOSTS:
docker_image_commands:
- 'rm -rf /var/run/network/*'
- 'yum install -y crontabs tar wget'
+ - 'rm /etc/init/tty.conf'
CONFIG:
type: aio
log_level: debug