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

fixup a few wrong settings in the configs

Browse Source 
add i386 images

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2015-12-10 10:14:08 -06:00
parent a0f7cc3336
commit 7d1294ffd7
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fedora.conf
View File

@ -219,7 +219,7 @@ createiso_skip = [
translate_paths = [ translate_paths = [
("/mnt/koji/compose/", "https://kojipkgs.fedoraproject.org/compose/"), ("/mnt/koji/compose/", "http://kojipkgs.fedoraproject.org/compose/"),
] ]
@ -242,7 +242,30 @@ image_build = [
'name': 'Fedora-Cloud-Base', 'name': 'Fedora-Cloud-Base',
'target': 'f24', 'target': 'f24',
'version': 'Rawhide', 'version': 'Rawhide',
'ksurl': 'https://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-cloud-base.ks",
'distro': 'Fedora-20',
'disk_size': 3
}
]
'i386': [
{
'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base',
'target': 'f24',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-docker-base.ks",
'distro': 'Fedora-20',
'disk_size': 3
},
{
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Cloud-Base',
'target': 'f24',
'version': 'Rawhide',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD',
'kickstart': "fedora-cloud-base.ks", 'kickstart': "fedora-cloud-base.ks",
'distro': 'Fedora-20', 'distro': 'Fedora-20',
'disk_size': 3 'disk_size': 3

2
nightly.sh
View File

@ -10,7 +10,7 @@ NIGHTLY="--nightly"
SKIP_PHASES="--skip-phase=productimg" SKIP_PHASES="--skip-phase=productimg"
DEST=$(pwd) DEST=$(pwd)
DATE=$(date "+%Y%m%d") DATE=$(date "+%Y%m%d")
COMPSFILE="fedora-f24.xml" COMPSFILE="comps-f24.xml"
TMPDIR=`mktemp -d /tmp/f24.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/f24.$DATE.XXXX`
# 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"