updates that have been done for testing

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

fedora.conf

@@ -7,13 +7,12 @@ product_is_layered = False
 
 # GENERAL SETTINGS
 bootable = True
-buildinstall_method = "lorax"
-comps_file = {
-    "scm": "git",
-    "repo": "git://git.fedorahosted.org/git/comps.git",
-    "branch": None, # defaults to cvs/HEAD or git/master
-    "file": "comps-f23.xml",
-}
+comps_file = "comps-f23.xml" #{
+#    "scm": "git",
+#    "repo": "git://git.fedorahosted.org/git/comps.git",
+#    "branch": None, # defaults to cvs/HEAD or git/master
+#    "file": "comps-f23.xml",
+#}
 
 variants_file="variants-fedora.xml"
 sigkeys = ["FD431D51", "F21541EB", None] # None = unsigned
@@ -44,10 +43,10 @@ pkgset_source = "koji" # koji, repos
 # pkgset_repos = {}
 
 # PKGSET - KOJI
-pkgset_koji_path_prefix = "/mnt/koji"
+pkgset_koji_path_prefix = "/mnt/koji/"
 pkgset_koji_url = "http://koji.fedoraproject.org/kojihub"
 pkgset_koji_tag = "f23"
-
+pkgset_koji_inherit = False
 
 # GATHER
 gather_source = "comps"
@@ -73,7 +72,7 @@ createrepo_c = True
 
 # BUILDINSTALL
 buildinstall_upgrade_image = True
-
+buildinstall_method = "lorax"
 
 # PRODUCTIMG
 # We'll probably need this stuff
@@ -188,15 +187,6 @@ extra_files = [
                 ],
                 "target": "",
             },
-            {
-                "scm": "git",
-                "repo": "",
-                "branch": None,
-                "file": [
-                    "aaa//B/README",
-                ],
-                "target": "",
-            },
         ],
     }),
 ]

nightly.sh

@@ -4,11 +4,13 @@
 export LC_ALL=C
 
 CONFIG="fedora.conf"
-TARGET_DIR="/mnt/fedora_koji/compose/rawhide"
+TARGET_DIR="/mnt/koji/compose/rawhide"
 DEBUG_MODE="--debug-mode"
+DEBUG_MODE=""
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES="--skip-phase=productimg --skip-phase=createiso --skip-phase=buildinstall "
+SKIP_PHASES=" "
 
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"