Change `rpm_release` to `pkg_version`

The RPM build logic uses a var called rpm_version The deb uses a more
generic name, pkg_version. Changing `rpm_release` to `pkg_version` makes
it easier to have consistent names.

Change-Id: Idb2eaa824f78222353c62755d25186ec42b761fa
Signed-off-by: Alok Anand <alok4nand@gmail.com>

diff --git a/rpm/build.py b/rpm/build.py
index dc162498ca73f4fa6e9ac59f2e63e9413f4f3fad..92a5c5aec8f537147656646a97b344cac655eab8 100755 (executable)
--- a/rpm/build.py
+++ b/rpm/build.py
@@ -31,14 +31,14 @@ rpm_out_dir = os.path.join(rpmbuild_dir, "RPMS", "noarch")
 
 # Templates that can be specialized into common artifact names per-build
 odl_template = Template("opendaylight-$version_major.$version_minor."
-                        "$version_patch-$rpm_release.tar.gz")
+                        "$version_patch-$pkg_version.tar.gz")
 specfile_template = Template("opendaylight-$version_major.$version_minor."
-                             "$version_patch-$rpm_release.spec")
+                             "$version_patch-$pkg_version.spec")
 unitfile_tb_template = Template("opendaylight-$sysd_commit.service.tar.gz")
 rpm_template = Template("opendaylight-$version_major.$version_minor."
-                        "$version_patch-$rpm_release.el7.noarch.rpm")
+                        "$version_patch-$pkg_version.el7.noarch.rpm")
 srpm_template = Template("opendaylight-$version_major.$version_minor."
-                         "$version_patch-$rpm_release.el7.src.rpm")
+                         "$version_patch-$pkg_version.el7.src.rpm")
 
 
 def build_rpm(build):

diff --git a/rpm/cache/cache.py b/rpm/cache/cache.py
index 91ba671fc42d53f03aadcd0bf9b5917c0f81f40a..7095a3064c8f554279e12bf0d81defd68e209510 100755 (executable)
--- a/rpm/cache/cache.py
+++ b/rpm/cache/cache.py
@@ -19,7 +19,7 @@ cache_dir = os.path.dirname(os.path.abspath(__file__))
 
 # Templates that can be specialized into artifact names/paths per-build
 odl_template = Template("opendaylight-$version_major.$version_minor."
-                        "$version_patch-$rpm_release.tar.gz")
+                        "$version_patch-$pkg_version.tar.gz")
 unitfile_template = Template("opendaylight-$sysd_commit.service")
 unitfile_url_template = Template("https://git.opendaylight.org/gerrit/"
                                  "gitweb?p=integration/packaging.git;a="

diff --git a/rpm/specs/build_specs.py b/rpm/specs/build_specs.py
index b1a2d8165bd6d55c3487c98b40d51a27a9870b5e..d73cf75c9a61138caaa1155a5d0509cd0ff8b14d 100755 (executable)
--- a/rpm/specs/build_specs.py
+++ b/rpm/specs/build_specs.py
@@ -24,7 +24,7 @@ template = env.get_template("opendaylight.spec")
 
 # Python string Template, specialized into a specfile file name per-build
 specfile_template = Template("opendaylight-$version_major.$version_minor."
-                             "$version_patch-$rpm_release.spec")
+                             "$version_patch-$pkg_version.spec")
 
 
 def build_spec(build):

diff --git a/rpm/specs/opendaylight.spec b/rpm/specs/opendaylight.spec
index 6a40e59ae45422fc481d10c3ad1d37b774067b5a..a6b65f9215a037156cc6307d4818b2a3a528b07e 100644 (file)
--- a/rpm/specs/opendaylight.spec
+++ b/rpm/specs/opendaylight.spec
@@ -8,13 +8,13 @@ Version:    {{ version_major }}.{{ version_minor }}.{{ version_patch }}
 #   unnecessary and unused in our case, but both the docs and the pros (apevec)
 #   agree that we should include it.
 # See: https://fedoraproject.org/wiki/Packaging:DistTag
-Release:    {{ rpm_release }}.el7
+Release:    {{ pkg_version }}.el7
 BuildArch:  noarch
 Summary:    OpenDaylight SDN Controller
 Group:      Applications/Communications
 License:    EPL-1.0
 URL:        http://www.opendaylight.org
-Source0:    %name-{{ version_major }}.{{ version_minor }}.{{ version_patch }}-{{ rpm_release }}.tar.gz
+Source0:    %name-{{ version_major }}.{{ version_minor }}.{{ version_patch }}-{{ pkg_version }}.tar.gz
 Source1:    %name-{{ sysd_commit }}.service.tar.gz
 Buildroot:  /tmp
 # Required for ODL at run time
@@ -65,5 +65,5 @@ fi
 %attr(0644,root,root) %{_unitdir}/%name.service
 
 %changelog
-* {{ changelog_date }} {{ changelog_name }} <{{ changelog_email }}> - {{ version_major }}.{{ version_minor }}.{{ version_patch }}-{{ rpm_release }}
-- Create {{ version_major }}.{{ version_minor }}.{{ version_patch }}-{{ rpm_release }} RPM
+* {{ changelog_date }} {{ changelog_name }} <{{ changelog_email }}> - {{ version_major }}.{{ version_minor }}.{{ version_patch }}-{{ pkg_version }}
+- Create {{ version_major }}.{{ version_minor }}.{{ version_patch }}-{{ pkg_version }} RPM

diff --git a/rpm/test_build.py b/rpm/test_build.py
index 93c437992fd4227a06cd229eca0ce91d8e36c3a9..ceed3fcd037ad966b435e99aaa9844816183996d 100644 (file)
--- a/rpm/test_build.py
+++ b/rpm/test_build.py
@@ -28,7 +28,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "4")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "1")
+        self.assertEqual(version["pkg_version"], "1")
 
     def test_beryllium_sr4_release_url(self):
         """Test URL of ODL Beryllium SR4 release."""
@@ -38,7 +38,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "4")
         self.assertEqual(version["version_minor"], "4")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "1")
+        self.assertEqual(version["pkg_version"], "1")
 
     def test_boron_release_url(self):
         """Test URL of ODL Boron release."""
@@ -48,7 +48,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "5")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "1")
+        self.assertEqual(version["pkg_version"], "1")
 
     def test_boron_sr1_release_url(self):
         """Test URL of ODL Boron SR1 release."""
@@ -58,7 +58,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "5")
         self.assertEqual(version["version_minor"], "1")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "1")
+        self.assertEqual(version["pkg_version"], "1")
 
     def test_boron_sr3_autorelease_url(self):
         """Test URL of ODL Boron SR3 autorelease."""
@@ -68,7 +68,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "5")
         self.assertEqual(version["version_minor"], "3")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "0.1.20170324rel1734")
+        self.assertEqual(version["pkg_version"], "0.1.20170324rel1734")
 
     @unittest.skip("No current Carbon autorelease examples")
     def test_carbon_autorelease_url(self):
@@ -79,7 +79,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "6")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "0.1.20161117rel1582")
+        self.assertEqual(version["pkg_version"], "0.1.20161117rel1582")
 
     def test_boron_sr2_snapshot_url(self):
         """Test URL of ODL Boron SR2 snapshot."""
@@ -89,7 +89,7 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "5")
         self.assertEqual(version["version_minor"], "2")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "0.1.20161212snap530")
+        self.assertEqual(version["pkg_version"], "0.1.20161212snap530")
 
     def test_carbon_snapshot_url(self):
         """Test URL of ODL Carbon snapshot."""
@@ -99,4 +99,4 @@ class TestExtractVersion(unittest.TestCase):
         self.assertEqual(version["version_major"], "6")
         self.assertEqual(version["version_minor"], "0")
         self.assertEqual(version["version_patch"], "0")
-        self.assertEqual(version["rpm_release"], "0.1.20161212snap2486")
+        self.assertEqual(version["pkg_version"], "0.1.20161212snap2486")

diff --git a/vars.py b/vars.py
index b8bb61d5367c926607ffbdd4a944a7d07016e848..f819111ae870dbd5e8db0a18d23fd9e15e2f9f21 100644 (file)
--- a/vars.py
+++ b/vars.py
@@ -54,7 +54,7 @@ def extract_version(url):
         #  org/opendaylight/integration/distribution-karaf/0.4.4-Beryllium-SR4/
         # build_id = 1533
         build_id = re.search(r'\/(autorelease)-([0-9]+)\/', url).group(2)
-        rpm_release = "0.1." + date + "rel" + build_id
+        pkg_version = "0.1." + date + "rel" + build_id
     elif "snapshot" in url:
         # Search the ODL snapshot build URL to match the date and the Build ID
         # that are between "distribution-karaf" and ".tar.gz".
@@ -68,9 +68,9 @@ def extract_version(url):
             r'\/(distribution-karaf)-'
             r'([0-9]\.[0-9]\.[0-9])-([0-9]+)\.([0-9]+)-([0-9]+)\.(tar\.gz)',
             url)
-        rpm_release = "0.1." + odl_rpm.group(3) + "snap" + odl_rpm.group(5)
+        pkg_version = "0.1." + odl_rpm.group(3) + "snap" + odl_rpm.group(5)
     elif "public" or "opendaylight.release" in url:
-        rpm_release = "1"
+        pkg_version = "1"
     else:
         raise ValueError("Unrecognized URL {}".format(url))
 
@@ -85,7 +85,7 @@ def extract_version(url):
     version["version_major"] = odl_version.group(2)
     version["version_minor"] = odl_version.group(3)
     version["version_patch"] = "0"
-    version["rpm_release"] = rpm_release
+    version["pkg_version"] = pkg_version
     version["codename"] = odl_version.group(4)
     return version