Update to ODL Neon RPM pipelines

Change-Id: I953c5cddcbb2f4315dbc786d334aea08fe8ac12e
Jira: INTPAK-211
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/CHANGELOG b/CHANGELOG
index 2d4d16b7b2e6997d33d2a59b57e132bf76971da4..9ba683551b3092c595ad17d53c46d3a410bc23c2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -88,3 +88,5 @@
 - Bind OVSDB and OpenFlow addresses to specific IP
 2018-10-03 Release 8.4.3
 - Adds configuration for OVSDB inactivity probe timer
+2018-10-08 Release 8.5.0
+- Bump ODL version to Neon

diff --git a/README.markdown b/README.markdown
index 070ca6248e0dd89b4f79c64edc78d82c49484009..4da40f7fb3f850cfc42f39ef38c59200426b654d 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-fluorine-epel-7-$basearch-devel',
+  rpm_repo => 'https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel',
 }
 ```
 

diff --git a/Rakefile b/Rakefile
index b424ff7a86de5d6fb2e04d799a2cb8f81e295916..afed9e6ef485ccb869b05b82eb3b200bdb48830c 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -22,28 +22,28 @@ task :metadata_lint do
 end
 
 # CentOS latest VM
-desc "Beaker tests against CentOS 7 VM with latest Fluorine RPM from ODL Nexus CD repo"
+desc "Beaker tests against CentOS 7 VM with latest Neon RPM from ODL Nexus CD repo"
 task :cent_devel_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"
+  sh "RS_SET=centos-7 RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel' bundle exec rake beaker"
 end
 
 # CentOS latest container
-desc "Beaker tests against CentOS 7 container with latest Fluorine RPM from ODL Nexus CD repo"
+desc "Beaker tests against CentOS 7 container with latest Neon RPM from ODL Nexus CD repo"
 task :cent_devel_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"
+  sh "RS_SET=centos-7-docker RPM_REPO='https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel' bundle exec rake beaker"
 end
 
 # CentOS latest release/SR VM
-#desc "Beaker tests against CentOS 7 VM with latest Fluorine release/SR RPM from CentOS CBS repo"
+#desc "Beaker tests against CentOS 7 VM with latest Neon release/SR RPM from CentOS CBS repo"
 #task :cent_rel_vm do
-#  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-release/$basearch/os/' bundle exec rake beaker"
+#  sh "RS_SET=centos-7 RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-10-release/$basearch/os/' bundle exec rake beaker"
 #end
 
 # CentOS latest release/SR container
-# Uncomment once there's a Fluorine release
-#desc "Beaker tests against CentOS 7 container with latest Fluorine release/SR RPM from CentOS CBS repo"
+# Uncomment once there's a Neon release
+#desc "Beaker tests against CentOS 7 container with latest Neon release/SR RPM from CentOS CBS repo"
 #task :cent_rel_dock do
-#  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-9-release/$basearch/os/' bundle exec rake beaker"
+#  sh "RS_SET=centos-7-docker RPM_REPO='http://cbs.centos.org/repos/nfv7-opendaylight-10-release/$basearch/os/' bundle exec rake beaker"
 #end
 
 # Multi-test helpers
@@ -66,7 +66,7 @@ desc "All tests, use VMs for Beaker tests"
 task :acceptance_vm => [
   :test,
   :cent_devel_vm,
-# Uncomment once there's a Fluorine release
+# Uncomment once there's a Neon release
 #  :cent_rel_vm,
 ]
 
@@ -74,6 +74,6 @@ desc "All tests, use containers for Beaker tests"
 task :acceptance_dock => [
   :test,
   :cent_devel_dock,
-# Uncomment once there's a Fluorine release
+# Uncomment once there's a Neon release
 #  :cent_rel_dock,
 ]

diff --git a/manifests/params.pp b/manifests/params.pp
index 5a9e86a6d56ea1a5957b1f929ca8456286bdf26b..d10e9984106418acebea1e495c53e350d8190d06 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-fluorine-epel-7-$basearch-devel'
+  $rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel'
   $deb_repo = 'ppa:odl-team/nitrogen'
   $log_levels = {}
   $enable_ha = false

diff --git a/metadata.json b/metadata.json
index 7553341e3bd3b5b1c7e4fa88b4bbfb235fb8ee6d..de914a3f3f181903139fc216afc7af0327bf81fd 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "opendaylight-opendaylight",
-    "version": "8.4.3",
+    "version": "8.5.0",
     "author": "Daniel Farrell",
     "summary": "Puppet module that installs and configures the OpenDaylight SDN controller",
     "license": "BSD-2-Clause",

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

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

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 69f23606f60ece770f44b33044fc826dd45c449b..be268202c2f98085cc0f93116ed9b93a0e05c2b7 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -356,7 +356,7 @@ end
 
 def rpm_install_tests(options = {})
   # Extract params
-  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-fluorine-epel-7-$basearch-devel')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel')
 
 
   # Default to CentOS 7 Yum repo URL
@@ -411,7 +411,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-fluorine-epel-7-$basearch-devel')
+  rpm_repo = options.fetch(:rpm_repo, 'https://nexus.opendaylight.org/content/repositories/opendaylight-neon-epel-7-$basearch-devel')
 
   # Confirm that classes fail on unsupported OSs
   it { expect { should contain_class('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }