Upgrade Beaker 3 to 4

[integration/packaging/puppet-opendaylight.git] / Rakefile

diff --git a/Rakefile b/Rakefile
index 241d64c463f9c8c62e282bba46897ef20a10d9f1..b424ff7a86de5d6fb2e04d799a2cb8f81e295916 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -17,46 +17,34 @@ PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
 # Linting
-
 task :metadata_lint do
   sh "metadata-json-lint metadata.json"
 end
 
-# CentOS Nexus VM
-desc "Beaker tests against CentOS 7 VM with latest Oxygen testing RPM from ODL Nexus repo"
-task :cent_8test_nexus_vm do
-  sh "RS_SET=centos-7 RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel' bundle exec rake beaker"
-end
-
-# CentOS Nexus Container
-desc "Beaker tests against CentOS 7 container with latest Oxygen testing RPM from ODL Nexus repo"
-task :cent_8test_nexus_dock do
-  sh "RS_SET=centos-7-docker RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel' bundle exec rake beaker"
+# CentOS latest VM
+desc "Beaker tests against CentOS 7 VM with latest Fluorine RPM from ODL Nexus CD repo"
+task :cent_devel_vm do
+  sh "RS_SET=centos-7 RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel' bundle exec rake beaker"
 end
 
-# CentOS CBS VM
-desc "Beaker tests against CentOS 7 VM with latest Oxygen testing RPM from CentOS CBS repo"
-task :cent_8test_cbs_vm do
-  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/' bundle exec rake beaker"
+# CentOS latest container
+desc "Beaker tests against CentOS 7 container with latest Fluorine RPM from ODL Nexus CD repo"
+task :cent_devel_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel' bundle exec rake beaker"
 end
 
-# CentOS CBS Container
-desc "Beaker tests against CentOS 7 container with latest Oxygen testing RPM from CentOS CBS repo"
-task :cent_8test_cbs_dock do
-  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/' bundle exec rake beaker"
-end
+# CentOS latest release/SR VM
+#desc "Beaker tests against CentOS 7 VM with latest Fluorine release/SR RPM from CentOS CBS repo"
+#task :cent_rel_vm do
+#  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-release/$basearch/os/' bundle exec rake beaker"
+#end
 
-# Ubuntu VMs
-desc "Beaker tests against Ubuntu 16.04 Container with Boron release Deb"
-task :ubuntu_6test_vm do
-  sh "RS_SET=ubuntu-16 DEB_REPO='ppa:odl-team/carbon' bundle exec rake beaker"
-end
-
-# Ubuntu Containers
-desc "Beaker tests against Ubuntu 16.04 Container with Boron release Deb"
-task :ubuntu_6test_dock do
-  sh "RS_SET=ubuntu-16-docker DEB_REPO='ppa:odl-team/carbon' bundle exec rake beaker"
-end
+# CentOS latest release/SR container
+# Uncomment once there's a Fluorine release
+#desc "Beaker tests against CentOS 7 container with latest Fluorine release/SR RPM from CentOS CBS repo"
+#task :cent_rel_dock do
+#  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-release/$basearch/os/' bundle exec rake beaker"
+#end
 
 # Multi-test helpers
 
@@ -71,21 +59,21 @@ task :test => [
 desc "Quick and important tests"
 task :sanity=> [
   :test,
-  :cent_8test_nexus_dock,
+  :cent_devel_dock,
 ]
 
 desc "All tests, use VMs for Beaker tests"
 task :acceptance_vm => [
   :test,
-  :ubuntu_6test_vm,
-  :cent_8test_cbs_vm,
-  :cent_8test_nexus_vm,
+  :cent_devel_vm,
+# Uncomment once there's a Fluorine release
+#  :cent_rel_vm,
 ]
 
 desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
-  :ubuntu_6test_dock,
-  :cent_8test_cbs_dock,
-  :cent_8test_nexus_dock,
+  :cent_devel_dock,
+# Uncomment once there's a Fluorine release
+#  :cent_rel_dock,
 ]