Rename product_* to release_*.

CHANGE: Rename product_* config options to release_* for consistency with productmd.
ACTION: Rename product_name, product_short, product_version, product_is_layered to release_* in config files.
        Rename //variant/product to //variant/release in variants XML.

tests/data/dummy-pungi.conf

@@ -1,40 +1,23 @@
-# PRODUCT (RELEASE) INFO
-product_name = "Dummy Product"
-product_short = "DP"
-product_version = "1.0"
-product_is_layered = False
-product_type = "ga"
+# RELEASE
+release_name = "Dummy Product"
+release_short = "DP"
+release_version = "1.0"
+release_is_layered = False
+release_type = "ga"
 
 
 # GENERAL SETTINGS
-bootable = False
 comps_file = "dummy-comps.xml"
 variants_file = "dummy-variants.xml"
-sigkeys = [None] # None = unsigned
-
-# limit tree architectures
-# if undefined, all architectures from variants.xml will be included
-atree_arches = ["x86_64"]
-
-# limit tree variants
-# if undefined, all variants from variants.xml will be included
-#tree_variants = ["Server"]
-
-multilib_arches = ["ppc64", "x86_64", "s390x"]
-multilib_methods = ["devel", "runtime"] # devel (recommended), all, base, file, kernel, none, runtime
 
 
-# RUNROOT settings
+# KOJI SETTINGS
 runroot = False
-#runroot_channel = ""
-#runroot_tag = ""
 
 
 # PKGSET
-pkgset_source = "repos" # koji, repos
-
-# PKGSET - REPOS
-# pkgset_repos format: {arch: [repo1_url, repo2_url, ...]}
+sigkeys = [None]
+pkgset_source = "repos"
 pkgset_repos = {
     "i386": [
         "repo",
@@ -47,45 +30,23 @@ pkgset_repos = {
     ],
 }
 
-# PKGSET - KOJI
-#pkgset_koji_path_prefix = "/mnt/koji"
-#pkgset_koji_url = ""
-#pkgset_koji_tag = ""
-
-
-# GATHER
-gather_source = "comps"
-gather_method = "deps"
-check_deps = False
-greedy_method = "build"
-
-# fomat: [(variant_uid_regex, {arch|*: [repos]})]
-# gather_lookaside_repos = []
-
-# GATHER - JSON
-# format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}}
-#gather_source_mapping = "/path/to/mapping.json"
-
 
 # CREATEREPO
 createrepo_checksum = "sha256"
 
 
-# BUILDINSTALL
+# GATHER
+gather_source = "comps"
+gather_method = "deps"
+greedy_method = "build"
+check_deps = False
 
+multilib_arches = ["ppc64", "x86_64", "s390x"]
+multilib_methods = ["devel", "runtime"]
 
-# PRODUCTIMG
-
-
-# CREATEISO
-symlink_isos_to = None
-
-
-# fomat: [(variant_uid_regex, {arch|*: [packages]})]
 additional_packages = [
     ('^Server$', {
         '*': [
-#            'dummy-lvm2-devel',
              'dummy-libtool',
         ],
     }),
@@ -119,14 +80,10 @@ filter_packages = [
     }),
 ]
 
-
-# format: {arch|*: [packages]}
 multilib_blacklist = {
     "*": [
         "kernel-devel",
         "httpd-devel",
-        "*",
-#        "dummy-glibc",
     ],
 }
 
@@ -135,3 +92,7 @@ multilib_whitelist = {
         "dummy-glibc",
     ],
 }
+
+
+# BUILDINSTALL
+bootable = False

tests/data/dummy-variants.xml

@@ -12,7 +12,7 @@
   </variant>
 
   <variant id="Gluster" name="Gluster Layered Product" type="layered-product">
-    <product name="Gluster" version="2.3" short="Gluster" />
+    <release name="Gluster" version="2.3" short="Gluster" />
     <arches>
       <arch>x86_64</arch>
     </arches>