Add carbon .deb to puppet-opendaylight

Change-Id: I76565b53f310c5004ae6683a21cfb53a4a079340
Signed-off-by: Akshita Jha <zenith158@gmail.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/Rakefile b/Rakefile
index 42daeea9bbd29240804fb19a8f3979c878ce379d..d88083619abfe2065421b4396241145581f765db 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -62,11 +62,17 @@ end
 
 # Ubuntu VMs
 
-# TODO: Add ubuntu_6test_dock task
+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
 
-# TODO: Add ubuntu_6test_dock task
+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
 
 # Multi-test helpers
 
@@ -85,16 +91,16 @@ task :sanity=> [
   :cent_6test_dock,
 ]
 
-# TODO: Update .deb to Carbon and add a ubuntu_6test_vm test
 desc "All tests, use VMs for Beaker tests"
 task :acceptance_vm => [
   :test,
+  :ubuntu_6test_vm,
   :cent_6test_vm,
 ]
 
-# TODO: Update .deb to Carbon and add a ubuntu_6test_dock test
 desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
+  :ubuntu_6test_dock,
   :cent_6test_dock,
 ]

diff --git a/manifests/params.pp b/manifests/params.pp
index 0f50662ff2e83b45cd50d671e387185edf66e55c..eaa6ef63d3180bae311d383bb04400c46a019efe 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,7 +13,7 @@ class opendaylight::params {
   $odl_rest_port = '8080'
   $odl_bind_ip = '0.0.0.0'
   $rpm_repo = 'opendaylight-6-testing'
-  $deb_repo = 'ppa:odl-team/boron'
+  $deb_repo = 'ppa:odl-team/carbon'
   $log_levels = {}
   $enable_ha = false
   $ha_node_ips = []

diff --git a/spec/classes/opendaylight_repos_spec.rb b/spec/classes/opendaylight_repos_spec.rb
index b1bb67f22c8b0ce16cc4d131570dc5ee9e4f51f8..50c5561a1dbb27f4add48141de9b314ed57f9963 100644 (file)
--- a/spec/classes/opendaylight_repos_spec.rb
+++ b/spec/classes/opendaylight_repos_spec.rb
@@ -5,7 +5,7 @@ describe 'opendaylight::repos' do
     context "with defaults" do
       it { should contain_class('opendaylight::repos') }
       it { should contain_class('apt') }
-      it { should contain_apt__ppa('ppa:odl-team/boron') }
+      it { should contain_apt__ppa('ppa:odl-team/carbon') }
     end
 
     context "with custom deb_repo" do

diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 2d3d6eb1b66bff240d821bc57d69ce7de6b7a35b..5bd3088321cf61c5c04dcfe8e5644ce346270aab 100644 (file)
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -581,8 +581,8 @@ describe 'opendaylight' do
         deb_install_tests
       end
 
-      context 'installing Boron Deb' do
-        deb_repo = 'ppa:odl-team/boron'
+      context 'installing Carbon Deb' do
+        deb_repo = 'ppa:odl-team/carbon'
         let(:facts) {{
           :osfamily => osfamily,
           :operatingsystem => operatingsystem,

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index cd9457b4451c9ae8eba2d9816e00451599ba7190..253f93f343e0fc3f2eb0e71ee304b0aa6c42a2a3 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -257,7 +257,7 @@ end
 
 def deb_install_tests(options = {})
   # Extract params
-  deb_repo = options.fetch(:deb_repo, 'ppa:odl-team/boron')
+  deb_repo = options.fetch(:deb_repo, 'ppa:odl-team/carbon')
 
   # Confirm the presence of Deb-related resources
   it { should contain_apt__ppa(deb_repo) }