Fix Beaker tests

* Update to ODL latest Boron, latest Carbon and latest Boron release.
* Get both VM and container-based tests working.
* Remove Fedora tests. Normally broken, currently broken for F25.
* Remove tarball-based Ubuntu tests. Not supported, moving to .deb
  installs for Ubuntu/Debian.
* Cleanup Rakefile helpers.

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

diff --git a/Gemfile b/Gemfile
index 0099ada8d1ce6c5450fc0113be94e5f24b0097ec..d672f2404880589d89721a82983b5a2c81137c7e 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,15 +2,15 @@ source "https://rubygems.org"
 
 group :test do
   gem "rake"
-  gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'
+  gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.8.0'
   gem "rspec-puppet"
   gem "puppetlabs_spec_helper"
   gem "metadata-json-lint"
+  gem "travis"
+  gem "travis-lint"
 end
 
 group :local_only do
-  gem "travis"
-  gem "travis-lint"
   gem "beaker"
   gem "beaker-rspec"
   gem "vagrant-wrapper"

diff --git a/Rakefile b/Rakefile
index 24582241f00f6ac914929f1b1be2f8aacbdcd33d..10668ccd32692b2b1353c984407a4d72a38a987a 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -35,80 +35,76 @@ exclude_paths = [
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
+# Linting
+
 task :metadata_lint do
   sh "metadata-json-lint metadata.json"
 end
 
 task :travis_lint do
-  sh "travis lint .travis.yml"
+  # Using "echo y" to accept interactive "install shell completion?" prompt
+  sh 'echo "y" travis lint .travis.yml --debug'
 end
 
-desc "Run syntax, lint, and spec tests."
-task :test => [
-  :syntax,
-  :lint,
-  :spec,
-  :metadata_lint,
-]
+# TODO: Add Coala helper
 
-desc "Run Beaker tests against CentOS 7 with latest Beryllium RPM"
-task :centos_odl4testing do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-4-testing' bundle exec rake beaker"
-end
+# CentOS VMs
 
-desc "Run Beaker tests against CentOS 7 with Beryllium SR2 4.2."
-task :centos_odl42 do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-42-release' bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 VM with latest Boron testing RPM"
+task :cent_5test_vm do
+  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-testing' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against CentOS 7 with Beryllium 4.0."
-task :centos_odl40 do
-  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-40-release' bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 VM with latest Carbon testing RPM"
+task :cent_6test_vm do
+  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against CentOS 7 using tarball install."
-task :centos_tarball do
-  sh "RS_SET=centos-7 INSTALL_METHOD=tarball bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 VM with latest Boron release RPM"
+task :cent_5rel_vm do
+  sh "RS_SET=centos-7 INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-release' bundle exec rake beaker"
 end
 
-# NB: The centos:7.0.1406 and centos:7.1.1503 tags have fakesytemd, not
-# the actually-functional systemd-container installed on centos:7
-# https://github.com/CentOS/sig-cloud-instance-build/commit/3bf1e7bbf14deaa8c047c1dfbead6d0e8d0665f2
-desc "Run Beaker tests against CentOS 7 Docker node."
-task :centos_docker do
-  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm bundle exec rake beaker"
-end
+# CentOS Containers
 
-desc "Run Beaker tests against Fedora 22 node."
-task :fedora_22 do
-  sh "RS_SET=fedora-22 INSTALL_METHOD=rpm bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 container with latest Boron testing RPM"
+task :cent_5test_dock do
+  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-testing' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against Fedora 23 node."
-task :fedora_23 do
-  sh "RS_SET=fedora-23 INSTALL_METHOD=rpm bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 container with latest Carbon testing RPM"
+task :cent_6test_dock do
+  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against Fedora 23 Docker node."
-task :fedora_23_docker do
-  sh "RS_SET=fedora-23-docker INSTALL_METHOD=rpm bundle exec rake beaker"
+desc "Beaker tests against CentOS 7 container with latest Boron release RPM"
+task :cent_5rel_dock do
+  sh "RS_SET=centos-7-docker INSTALL_METHOD=rpm RPM_REPO='opendaylight-5-release' bundle exec rake beaker"
 end
 
-desc "Run Beaker tests against Ubuntu 14.04 node."
-task :ubuntu_1404 do
-  sh "RS_SET=ubuntu-1404 INSTALL_METHOD=tarball bundle exec rake beaker"
-end
+# Multi-test helpers
 
-desc "Run Beaker tests against Ubuntu 14.04 Docker node."
-task :ubuntu_1404_docker do
-  sh "RS_SET=ubuntu-1404-docker INSTALL_METHOD=tarball bundle exec rake beaker"
-end
+desc "Run syntax, lint, and spec tests."
+task :test => [
+  :syntax,
+  :lint,
+  :metadata_lint,
+  :travis_lint,
+  :spec,
+]
 
-# Note: Puppet currently doesn't support Ubuntu versions newer than 14.04
-# https://docs.puppetlabs.com/guides/install_puppet/install_debian_ubuntu.html
+desc "All tests, use VMs for Beaker tests"
+task :acceptance_vm => [
+  :test,
+  :cent_5rel_vm,
+  :cent_5test_vm,
+  :cent_6test_vm,
+]
 
-desc "All tests, including Beaker tests against all nodes."
-task :acceptance => [
+desc "All tests, use containers for Beaker tests"
+task :acceptance_dock => [
   :test,
-  :centos_7_docker,
+  :cent_5rel_dock,
+  :cent_5test_dock,
+  :cent_6test_dock,
 ]

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
deleted file mode 100644 (file)
index 3de11f4..0000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-HOSTS:
-  centos-7:
-    roles:
-      - master
-    platform: el-7-x86_64
-    box: chef/centos-7.0
-    box_url: https://vagrantcloud.com/chef/boxes/centos-7.0
-    hypervisor: vagrant
-
-CONFIG:
-  log_level: verbose
-  type: foss

diff --git a/spec/acceptance/nodesets/fedora-22.yml b/spec/acceptance/nodesets/fedora-22.yml
deleted file mode 100644 (file)
index 6d07554..0000000
--- a/spec/acceptance/nodesets/fedora-22.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-HOSTS:
-  fedora-22:
-    roles:
-      - master
-    platform: fedora-22-x86_64
-    box: fedora/22-cloud-base
-    box_url: https://dl.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
-    hypervisor: vagrant
-
-CONFIG:
-  log_level: verbose
-  type: foss

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

diff --git a/spec/acceptance/nodesets/fedora-23.yml b/spec/acceptance/nodesets/fedora-23.yml
deleted file mode 100644 (file)
index 4d5d578..0000000
--- a/spec/acceptance/nodesets/fedora-23.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-HOSTS:
-  fedora-23:
-    roles:
-      - master
-    platform: fedora-23-x86_64
-    box: fedora/23-cloud-base
-    box_url: https://atlas.hashicorp.com/fedora/boxes/23-cloud-base
-    hypervisor: vagrant
-
-CONFIG:
-  log_level: verbose
-  type: foss

diff --git a/spec/acceptance/nodesets/ubuntu-1404-docker.yml b/spec/acceptance/nodesets/ubuntu-1404-docker.yml
deleted file mode 100644 (file)
index bc8ed83..0000000
--- a/spec/acceptance/nodesets/ubuntu-1404-docker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-HOSTS:
-  ubuntu-1404-docker:
-    platform: ubuntu-14.04-x64
-    image: ubuntu:14.04
-    hypervisor: docker
-CONFIG:
-  type: foss

diff --git a/spec/acceptance/nodesets/ubuntu-1404.yml b/spec/acceptance/nodesets/ubuntu-1404.yml
deleted file mode 100644 (file)
index 09365ec..0000000
--- a/spec/acceptance/nodesets/ubuntu-1404.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-HOSTS:
-  ubuntu-1404:
-    roles:
-      - master
-    platform: ubuntu-1404-amd64
-    box: boxcutter/ubuntu1404
-    box_url: https://atlas.hashicorp.com/boxcutter/boxes/ubuntu1404
-    hypervisor: vagrant
-
-CONFIG:
-  log_level: verbose
-  type: foss