davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates that have been done for testing

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2015-07-07 15:14:06 +00:00
parent b1001169a8
commit 778eabff0e
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fedora.conf
View File

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

4
nightly.sh
View File

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