Update master branch to Fluorine

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

diff --git a/Rakefile b/Rakefile
index e7a176a0850fa729df8c3a5a43eff9e42696cf8d..36b4bfc823369365e47bdc9bcc91347190022674 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -22,32 +22,28 @@ task :metadata_lint do
   sh "metadata-json-lint metadata.json"
 end
 
-# CentOS VMs
-
-desc "Beaker tests against CentOS 7 VM with latest Carbon testing RPM"
-task :cent_6test_vm do
-  sh "RS_SET=centos-7 RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
+# CentOS Nexus VM
+desc "Beaker tests against CentOS 7 VM with latest Fluorine testing RPM from ODL Nexus repo"
+task :cent_9test_nexus_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 Containers
-
-desc "Beaker tests against CentOS 7 container with latest Carbon testing RPM"
-task :cent_6test_dock do
-  sh "RS_SET=centos-7-docker RPM_REPO='opendaylight-6-testing' bundle exec rake beaker"
+# CentOS Nexus Container
+desc "Beaker tests against CentOS 7 container with latest Fluorine testing RPM from ODL Nexus repo"
+task :cent_9test_nexus_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
 
-# 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"
+# CentOS CBS VM
+desc "Beaker tests against CentOS 7 VM with latest Fluorine testing RPM from CentOS CBS repo"
+task :cent_9test_cbs_vm do
+  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-testing/$basearch/os/' 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"
+# CentOS CBS Container
+desc "Beaker tests against CentOS 7 container with latest Fluorine testing RPM from CentOS CBS repo"
+task :cent_9test_cbs_dock do
+  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-testing/$basearch/os/' bundle exec rake beaker"
 end
 
 # Multi-test helpers
@@ -63,19 +59,19 @@ task :test => [
 desc "Quick and important tests"
 task :sanity=> [
   :test,
-  :cent_6test_dock,
+  :cent_9test_nexus_dock,
 ]
 
 desc "All tests, use VMs for Beaker tests"
 task :acceptance_vm => [
   :test,
-  :ubuntu_6test_vm,
-  :cent_6test_vm,
+  :cent_9test_cbs_vm,
+  :cent_9test_nexus_vm,
 ]
 
 desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
-  :ubuntu_6test_dock,
-  :cent_6test_dock,
+  :cent_9test_cbs_dock,
+  :cent_9test_nexus_dock,
 ]