Use strings for all RPM version variables

The new Be ERP rpm_version values of the format

<rpm_release>.<ERP date version>

Broke the `-v` param's int expectations, so that argparse option was
removed. Params to build.py then become strings by default. The
build_vars configuration used unquoted numbers for version values, which
were being read in as ints, causing the comparison between version
values passed to the script and those read in from build_vars to fail
based on type differences. Quotes were added to the data to specify
explicitly that version vars should be treated as strings.

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

diff --git a/rpm/build.py b/rpm/build.py
index d8349fd2c82feb713c7038711cdb60f80bed53b6..a919b282d01d97d44768bb6440a13c54624f2c60 100755 (executable)
--- a/rpm/build.py
+++ b/rpm/build.py
@@ -100,7 +100,7 @@ if __name__ == "__main__":
     # TODO: More docs on ArgParser and argument
     parser = argparse.ArgumentParser()
     parser.add_argument("-v", "--version", action="append",
-                        metavar="major minor patch rpm", nargs="*", type=int,
+                        metavar="major minor patch rpm", nargs="*",
                         help="RPM version(s) to build")
     parser.add_argument("-a", "--all", action="store_true",
                         help="Build all RPMs")

diff --git a/rpm/build_vars.yaml b/rpm/build_vars.yaml
index 38de041fa13b6f5138db6f970cf656e2ae2de596..97ea798ec55e92fb6f123b1fd7f9fc1385776550 100644 (file)
--- a/rpm/build_vars.yaml
+++ b/rpm/build_vars.yaml
@@ -23,10 +23,10 @@
 
 ---
 builds:
-  - version_major: 2
-    version_minor: 4
-    version_patch: 0
-    rpm_release: 1
+  - version_major: "2"
+    version_minor: "4"
+    version_patch: "0"
+    rpm_release: "1"
     rpm_disttag: el7
     java_version: "= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
@@ -35,10 +35,10 @@ builds:
     changelog: |
       * Tue Sep 15 2015 Daniel Farrell <dfarrell@redhat.com> - 2.4.0-1
       - Create Helium SR4 RPM
-  - version_major: 3
-    version_minor: 0
-    version_patch: 0
-    rpm_release: 2
+  - version_major: "3"
+    version_minor: "0"
+    version_patch: "0"
+    rpm_release: "2"
     rpm_disttag: el7
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
@@ -47,10 +47,10 @@ builds:
     changelog: |
       * Fri Jul 17 2015 Daniel Farrell <dfarrell@redhat.com> - 3.0.0-2
       - Include required disttag in RPM release version
-  - version_major: 3
-    version_minor: 1
-    version_patch: 0
-    rpm_release: 1
+  - version_major: "3"
+    version_minor: "1"
+    version_patch: "0"
+    rpm_release: "1"
     rpm_disttag: el7
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
@@ -59,10 +59,10 @@ builds:
     changelog: |
       * Tue Sep 15 2015 Daniel Farrell <dfarrell@redhat.com> - 3.1.0-1
       - Create Lithium SR1 RPM
-  - version_major: 3
-    version_minor: 2
-    version_patch: 0
-    rpm_release: 1
+  - version_major: "3"
+    version_minor: "2"
+    version_patch: "0"
+    rpm_release: "1"
     rpm_disttag: el7
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
@@ -71,10 +71,10 @@ builds:
     changelog: |
       * Mon Oct 26 2015 Daniel Farrell <dfarrell@redhat.com> - 3.2.0-1
       - Create Lithium SR2 RPM
-  - version_major: 3
-    version_minor: 3
-    version_patch: 0
-    rpm_release: 1
+  - version_major: "3"
+    version_minor: "3"
+    version_patch: "0"
+    rpm_release: "1"
     rpm_disttag: el7
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed
@@ -83,10 +83,10 @@ builds:
     changelog: |
       * Fri Dec 11 2015 Daniel Farrell <dfarrell@redhat.com> - 3.3.0-1
       - Create Lithium SR3 RPM
-  - version_major: 4
-    version_minor: 0
-    version_patch: 0
-    rpm_release: 1.201512150335
+  - version_major: "4"
+    version_minor: "0"
+    version_patch: "0"
+    rpm_release: "1.201512150335"
     rpm_disttag: el7
     java_version: ">= 1:1.7.0"
     sysd_commit: c6d7ee1f21d62ff8ffb741c7a12c3d8d3aa3d6ed