Add Docker-based CentOS 7 Beaker tests

Uses Docker instead of Vagrant as the Beaker provider.

This should make it possible to run Beaker tests on VMs, like in ODL's
CI system. It also works around long-standing instabilities with Vagrant
and Beaker

Change-Id: Ieed91687a0b0fa826070d5590f708b4e8de7f89e
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/Rakefile b/Rakefile
index 2635a502e5f16fe1ac45528370b521575968a27e..6cbc739886490dd751e82d7aa8fa39267985c79d 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -57,6 +57,11 @@ task :centos_tarball do
   sh "RS_SET=centos-7 INSTALL_METHOD=tarball bundle exec rake beaker"
 end
 
+desc "Run Beaker tests against CentOS 7 Docker node."
+task :centos_7_docker do
+  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm bundle exec rake beaker"
+end
+
 desc "Run Beaker tests against Fedora 20 node."
 task :fedora_20 do
   sh "RS_SET=fedora-20 INSTALL_METHOD=rpm bundle exec rake beaker"

diff --git a/spec/acceptance/nodesets/centos-7-docker.yml b/spec/acceptance/nodesets/centos-7-docker.yml
new file mode 100644 (file)
index 0000000..c88ebe8
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-7-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  centos-7-docker:
+    roles:
+      - master
+    platform: el-7-x86_64
+    image: centos:7
+    docker_cmd: '["/sbin/init"]'
+    hypervisor: docker
+
+CONFIG:
+  log_level: verbose
+  type: foss

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index fdec4da75ac514cf22b8c6bd9073427c9cbbb3cc..f7f64a04db4e3346bae1377d205744218394ab61 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -143,7 +143,7 @@ def generic_validations()
     describe package('java-1.7.0-openjdk') do
       it { should be_installed }
     end
-  elsif ['centos-7', 'fedora-21'].include? ENV['RS_SET']
+  elsif ['centos-7', 'centos-7-docker', 'fedora-21'].include? ENV['RS_SET']
     # Validations for modern Red Hat family OSs
 
     # Verify ODL systemd .service file