Update RPM test, Dockerfile ODL versions 7->7.1

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

diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index c4c116d9f990d0ae2ff735dc29915878f61e81b2..6502266b6baf3113655a96325f781b6acf5657fc 100755 (executable)
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -2,13 +2,13 @@ FROM centos:7
 
 # Schema: https://github.com/projectatomic/ContainerApplicationGenericLabels
 LABEL name="Int/Pack CentOS Dockerfile" \
-      version="7.0" \
+      version="7.1" \
       vendor="OpenDaylight" \
       summary="OpenDaylight Integration/Packaging example CentOS Dockerfile" \
       vcs-url="https://git.opendaylight.org/gerrit/p/integration/packaging.git"
 
 # Install OpenDaylight
-RUN yum install -y http://cbs.centos.org/repos/nfv7-opendaylight-70-release/x86_64/os/Packages/opendaylight-7.0.0-1.el7.noarch.rpm && yum clean all
+RUN yum install -y http://cbs.centos.org/repos/nfv7-opendaylight-71-release/x86_64/os/Packages/opendaylight-7.1.0-1.el7.noarch.rpm && yum clean all
 
 # Ports
 # 8101 - Karaf SSH

diff --git a/packages/test_lib.py b/packages/test_lib.py
index 371aca4ca17d89a88ef1c5282e10fda2d52a95cd..8ec4d6acd4e380603cd7fd8a79308d7ba57842dc 100644 (file)
--- a/packages/test_lib.py
+++ b/packages/test_lib.py
@@ -79,6 +79,26 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["pkg_version"], "1")
         self.assertEqual(version["codename"], "")
 
+    def test_nitrogen_sr1_release_url(self):
+        """Test URL of the ODL Nitrogen SR1 release."""
+        url = "%s/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz" % self.nexus_url
+        version = lib.extract_version(url)
+        self.assertEqual(version["version_major"], "7")
+        self.assertEqual(version["version_minor"], "1")
+        self.assertEqual(version["version_patch"], "0")
+        self.assertEqual(version["pkg_version"], "1")
+        self.assertEqual(version["codename"], "")
+
+    def test_nitrogen_release_zip_url(self):
+        """Test URL of the ODL Nitrogen release zip archive."""
+        url = "%s/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.zip" % self.nexus_url
+        version = lib.extract_version(url)
+        self.assertEqual(version["version_major"], "7")
+        self.assertEqual(version["version_minor"], "1")
+        self.assertEqual(version["version_patch"], "0")
+        self.assertEqual(version["pkg_version"], "1")
+        self.assertEqual(version["codename"], "")
+
     def test_carbon_autorelease_url(self):
         """Test URL of an ODL Carbon autorelease build."""
         url = "%s/autorelease-1996/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz" % self.nexus_url