Update master branch to Fluorine

Update all default/test branch references from Oxygen to Fluorine.

Didn't manually check for possible changes to templates, expecting tests
or config file maintainers to catch problems and fix.

Issue: INTPAK-147
Change-Id: Ia491a9e0eb695882e218484b3d35017cf7295df0
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/README.markdown b/README.markdown
index 5915f399a1b6274c9ec496ac4d54e0cc3404c586..5933cbb67aa557bfe0c59e8cacb4440b3b981e4c 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -96,7 +96,7 @@ OpenDaylight is installed from.
 
 ```puppet
 class { 'opendaylight':
-  rpm_repo => 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel',
+  rpm_repo => 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel',
 }
 ```
 

diff --git a/Rakefile b/Rakefile
index 685a28bdef762f196ae49f4bd61cc7ef66f5eb1c..36b4bfc823369365e47bdc9bcc91347190022674 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -23,41 +23,29 @@ task :metadata_lint do
 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"
+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 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"
+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
 
 # 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"
+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
 
 # 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"
+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
 
-# Ubuntu VMs
-#desc "Beaker tests against Ubuntu 16.04 Container with Nitrogen release Deb"
-#task :ubuntu_6test_vm do
-#  sh "RS_SET=ubuntu-16 DEB_REPO='ppa:odl-team/nitrogen' bundle exec rake beaker"
-#end
-
-# Ubuntu Containers
-#desc "Beaker tests against Ubuntu 16.04 Container with Nitrogen release Deb"
-#task :ubuntu_6test_dock do
-#  sh "RS_SET=ubuntu-16-docker DEB_REPO='ppa:odl-team/nitrogen' bundle exec rake beaker"
-#end
-
 # Multi-test helpers
 
 desc "Run syntax, lint, and spec tests."
@@ -71,19 +59,19 @@ task :test => [
 desc "Quick and important tests"
 task :sanity=> [
   :test,
-  :cent_8test_nexus_dock,
+  :cent_9test_nexus_dock,
 ]
 
 desc "All tests, use VMs for Beaker tests"
 task :acceptance_vm => [
   :test,
-  :cent_8test_cbs_vm,
-  :cent_8test_nexus_vm,
+  :cent_9test_cbs_vm,
+  :cent_9test_nexus_vm,
 ]
 
 desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
-  :cent_8test_cbs_dock,
-  :cent_8test_nexus_dock,
+  :cent_9test_cbs_dock,
+  :cent_9test_nexus_dock,
 ]

diff --git a/manifests/params.pp b/manifests/params.pp
index 74d45a60c59481ab12b845216f780010cc380ce7..d384cca08c43ef9548e93ab50289e9a3217e803e 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -12,7 +12,7 @@ class opendaylight::params {
   $extra_features = []
   $odl_rest_port = '8181'
   $odl_bind_ip = '0.0.0.0'
-  $rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel'
+  $rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel'
   $deb_repo = 'ppa:odl-team/nitrogen'
   $log_levels = {}
   $enable_ha = false

diff --git a/spec/classes/opendaylight_repos_spec.rb b/spec/classes/opendaylight_repos_spec.rb
index 2f52784a827538e9962a854d0533c76159a9c8c2..03a8f94c6707062b494d3d723b61439b8fcc4d43 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  => 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel',
+          :baseurl  => 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel',
           :enabled  => 1,
           :gpgcheck => 0,
         )

diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 4e5a77cc84b18f134b6fa0cd9e3d90d51b0e90fa..b237d092e0442eff61775e93378995ad8d96b74b 100644 (file)
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -673,7 +673,7 @@ describe 'opendaylight' do
       end
 
       context 'installing from Nexus repo' do
-        rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel'
+        rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel'
         let(:facts) {{
           :osfamily => osfamily,
           :operatingsystem => operatingsystem,

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 93a66cd8c447897d289abef92509bd6137afd7ec..c34def9bdac9b50e59141bc07eca467a7f61c141 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -285,7 +285,7 @@ end
 
 def rpm_install_tests(options = {})
   # Extract params
-  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel')
 
 
   # Default to CentOS 7 Yum repo URL
@@ -340,7 +340,7 @@ end
 def unsupported_os_tests(options = {})
   # Extract params
   expected_msg = options.fetch(:expected_msg)
-  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel')
 
   # Confirm that classes fail on unsupported OSs
   it { expect { should contain_class('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }