Use latest pre-release Carbon RPM by default

This is tested by the daily ODL test-puppet job, works.

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

diff --git a/manifests/params.pp b/manifests/params.pp
index 886bf0a9481c2967a178f95bbb928d96a20358b4..6ea13119b97424c9ae7653a02488e51b7abee501 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -12,7 +12,7 @@ class opendaylight::params {
   $extra_features = []
   $odl_rest_port = '8080'
   $odl_bind_ip = '0.0.0.0'
-  $rpm_repo = 'opendaylight-5-testing'
+  $rpm_repo = 'opendaylight-6-testing'
   $deb_repo = 'ppa:odl-team/boron'
   $log_levels = {}
   $enable_ha = false

diff --git a/spec/classes/opendaylight_repos_spec.rb b/spec/classes/opendaylight_repos_spec.rb
index 638fea1e68927efbde097fb83cd166a221b1c5f1..b1bb67f22c8b0ce16cc4d131570dc5ee9e4f51f8 100644 (file)
--- a/spec/classes/opendaylight_repos_spec.rb
+++ b/spec/classes/opendaylight_repos_spec.rb
@@ -20,8 +20,8 @@ describe 'opendaylight::repos' do
     context "with defaults" do
       it { should contain_class('opendaylight::repos') }
       it {
-        should contain_yumrepo('opendaylight-5-testing').with(
-          :baseurl  => 'http://cbs.centos.org/repos/nfv7-opendaylight-5-testing/$basearch/os/',
+        should contain_yumrepo('opendaylight-6-testing').with(
+          :baseurl  => 'http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/$basearch/os/',
           :enabled  => 1,
           :gpgcheck => 0,
         )

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9571e2a2be678b8b42bc8f4b7b9828a92e60e501..cd3b618716c4c17ae72c2a0922cc7ca2a254dbca 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -215,7 +215,7 @@ end
 
 def rpm_install_tests(options = {})
   # Extract params
-  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-5-testing')
+  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-6-testing')
   java_opts = options.fetch(:java_opts, '-Djava.net.preferIPv4Stack=true')
 
   # Default to CentOS 7 Yum repo URL
@@ -279,7 +279,7 @@ end
 def unsupported_os_tests(options = {})
   # Extract params
   expected_msg = options.fetch(:expected_msg)
-  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-5-testing')
+  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-6-testing')
 
   # Confirm that classes fail on unsupported OSs
   it { expect { should contain_class('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }