Change default RPM repo, CentOS CBS to ODL Nexus

Move to our fully-automated CD repos as the default RPM install source.

Change-Id: Iea24629c18699b2b793d0a55d88b3516a3c5b75b
Fixes: INTPAK-112
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/Rakefile b/Rakefile
index 8a2d0e59df6ddfa049b81f38425e04229cfdaf75..241d64c463f9c8c62e282bba46897ef20a10d9f1 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -22,18 +22,6 @@ task :metadata_lint do
   sh "metadata-json-lint metadata.json"
 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"
-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 Nexus VM
 desc "Beaker tests against CentOS 7 VM with latest Oxygen testing RPM from ODL Nexus repo"
 task :cent_8test_nexus_vm do
@@ -46,6 +34,18 @@ 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"
 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"
+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
+
 # Ubuntu VMs
 desc "Beaker tests against Ubuntu 16.04 Container with Boron release Deb"
 task :ubuntu_6test_vm do
@@ -71,21 +71,21 @@ task :test => [
 desc "Quick and important tests"
 task :sanity=> [
   :test,
-  :cent_8test_cbs_dock,
+  :cent_8test_nexus_dock,
 ]
 
-# TODO: Add cent_8test_nexus_vm when INTPAK-10 is fixed
 desc "All tests, use VMs for Beaker tests"
 task :acceptance_vm => [
   :test,
   :ubuntu_6test_vm,
   :cent_8test_cbs_vm,
+  :cent_8test_nexus_vm,
 ]
 
-# TODO: Add cent_8test_nexus_dock when INTPAK-10 is fixed
 desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
   :ubuntu_6test_dock,
   :cent_8test_cbs_dock,
+  :cent_8test_nexus_dock,
 ]

diff --git a/manifests/params.pp b/manifests/params.pp
index 6edb4ce3667059446e0f8f0f9f57ef52ccb856a4..ee9fba4b137409798ab4d7b38df8cb1a670fd39b 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 = 'http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/'
+  $rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel'
   $deb_repo = 'ppa:odl-team/carbon'
   $log_levels = {}
   $enable_ha = false

diff --git a/spec/classes/opendaylight_repos_spec.rb b/spec/classes/opendaylight_repos_spec.rb
index 17796ad45c6a75ace1885959a563aad4c0e8b85a..d8bb4545aa6fc1ae87d51857be69c4677c0c6847 100644 (file)
--- a/spec/classes/opendaylight_repos_spec.rb
+++ b/spec/classes/opendaylight_repos_spec.rb
@@ -21,7 +21,7 @@ describe 'opendaylight::repos' do
       it { should contain_class('opendaylight::repos') }
       it {
         should contain_yumrepo('opendaylight').with(
-          :baseurl  => 'http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/',
+          :baseurl  => 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel',
           :enabled  => 1,
           :gpgcheck => 0,
         )

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 205081817fbcfecdea8bc0b49a556fcea19ee1ca..1606d4d8fcf16df6355efa16b118e1c707cec09e 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -228,7 +228,7 @@ end
 
 def rpm_install_tests(options = {})
   # Extract params
-  rpm_repo = options.fetch(:rpm_repo, 'http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel')
   java_opts = options.fetch(:java_opts, '-Djava.net.preferIPv4Stack=true')
 
   # Default to CentOS 7 Yum repo URL
@@ -292,7 +292,7 @@ end
 def unsupported_os_tests(options = {})
   # Extract params
   expected_msg = options.fetch(:expected_msg)
-  rpm_repo = options.fetch(:rpm_repo, 'http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/$basearch/os/')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel')
 
   # Confirm that classes fail on unsupported OSs
   it { expect { should contain_class('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
@@ -411,4 +411,4 @@ def odl_websocket_address_tests(options = {})
       'content'     =>  /<websocket-address>#{odl_bind_ip}<\/websocket-address>/
     )
   }
-end
\ No newline at end of file
+end