Remove Carbon tests, Carbon no longer supported

[integration/packaging.git] / packages / build.py

diff --git a/packages/build.py b/packages/build.py
index 36dbab789a86672852d8384ca774c76a1970c95c..1539eea8efbfcc88f298470354558ed7108fc355 100755 (executable)
--- a/packages/build.py
+++ b/packages/build.py
@@ -10,9 +10,10 @@
 import argparse
 import sys
 
-from deb import build as build_deb
-from rpm import build as build_rpm
-import vars
+import lib
+
+from deb import lib as deb_lib
+from rpm import lib as rpm_lib
 
 if __name__ == "__main__":
     # Accept a build definition via args
@@ -76,45 +77,57 @@ if __name__ == "__main__":
     # Build definition, populated below
     build = {}
 
-    # Add changelog name/email to build definition
-    build.update({"changelog_name": args.changelog_name,
-                  "changelog_email": args.changelog_email})
+    # Add changelog name to build definition
+    if not args.changelog_name:
+        # If empty string passed, as happens when a bash script calls this
+        # script with unset var, use default
+        build.update({"changelog_name": "Jenkins"})
+    else:
+        build.update({"changelog_name": args.changelog_name})
+
+    # Add changelog email to build definition
+    if not args.changelog_email:
+        # If empty string passed, as happens when a bash script calls this
+        # script with unset var, use default
+        build.update(
+            {"changelog_email": "jenkins-donotreply@opendaylight.org"})
+    else:
+        build.update({"changelog_email": args.changelog_email})
 
     # Depending on pkg type, add appropriate-format changelog date to build def
     if args.rpm:
-        build.update({"changelog_date": vars.get_changelog_date("rpm")})
+        build.update({"changelog_date": lib.get_changelog_date("rpm")})
     if args.deb:
-        build.update({"changelog_date": vars.get_changelog_date("deb")})
+        build.update({"changelog_date": lib.get_changelog_date("deb")})
 
     # If hash of systemd unit file given add to build def, else use latest hash
     if args.sysd_commit:
         build.update({"sysd_commit": args.sysd_commit})
     else:
-        build.update({"sysd_commit": vars.get_sysd_commit()})
+        build.update({"sysd_commit": lib.get_sysd_commit()})
 
     # Argparse rules imply args.major will only be present for latest_snap
     # builds and args.download_url will only be present for generic builds.
     # If doing a latest-snap build, find latest build tarball URL for given
     # major version and add to build definition. Else, add URL directly.
     if hasattr(args, "major"):
-        # FIXME: In the process of removing minor_version, pass None for now
-        build.update({"download_url": vars.get_snap_url(args.major, None)})
+        build.update({"download_url": lib.get_snap_url(args.major)})
     else:
         build.update({"download_url": args.download_url})
 
     # Use download_url to find pkg version, add to build def
-    build.update(vars.extract_version(build["download_url"]))
+    build.update(lib.extract_version(build["download_url"]))
 
     # Karaf 3 distros use distribution-karaf-, Karaf 4 uses karaf-
-    build.update({"distro_name_prefix": vars.get_distro_name_prefix(
+    build.update({"distro_name_prefix": lib.get_distro_name_prefix(
         build['version_major'])})
 
     # Update build definition with Java version required by ODL version
-    build.update({"java_version": vars.get_java_version(
+    build.update({"java_version": lib.get_java_version(
         build['version_major'])})
 
     # Use package-specific helper logic to do the specified build
     if args.rpm:
-        build_rpm.build_rpm(build)
+        rpm_lib.build_rpm(build)
     elif args.deb:
-        build_deb.build_deb(build)
+        deb_lib.build_deb(build)