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

adjust for comps and spin-kickstarts moving

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-05-13 18:26:23 -05:00
parent 6930d50837
commit c4db7dce41
5 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fedora-alpha.conf
View File

@ -8,7 +8,7 @@ release_is_layered = False
bootable = True
comps_file = 'comps-f24.xml' #{
# 'scm': 'git',
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
# 'repo': 'https://pagure.io/fedora-comps.git',
# 'branch': None, # defaults to cvs/HEAD or git/master
# 'file': 'comps-f23.xml',
#}
@ -282,7 +282,7 @@ image_build = {
'version': '24_Alpha',
'release': 7,
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -301,7 +301,7 @@ image_build = {
'target': 'f24',
'version': '24_Alpha',
'release': 7,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -318,7 +318,7 @@ image_build = {
'target': 'f24',
'version': '24_Alpha',
'release': 7,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
@ -333,7 +333,7 @@ image_build = {
live_media_version = '24_Alpha'
live_media_release = '7'
live_media_ksurl = 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24'
live_media_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24'
live_media_target = 'f24'
live_media = {
@ -477,7 +477,7 @@ live_images = [
'kickstart': 'fedora-arm-workstation.ks',
'name': 'Fedora-Workstation-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'type': 'appliance'
}
@ -487,7 +487,7 @@ live_images = [
'kickstart': 'fedora-arm-server.ks',
'name': 'Fedora-Server-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'type': 'appliance'
}
@ -497,7 +497,7 @@ live_images = [
'kickstart': 'fedora-arm-kde.ks',
'name': 'Fedora-KDE-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'repo_from': 'Everything',
'type': 'appliance',
@ -507,7 +507,7 @@ live_images = [
'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'repo_from': 'Everything',
'type': 'appliance',
@ -517,7 +517,7 @@ live_images = [
'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'repo_from': 'Everything',
'type': 'appliance',
@ -527,7 +527,7 @@ live_images = [
'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'repo_from': 'Everything',
'type': 'appliance',
@ -537,7 +537,7 @@ live_images = [
'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'repo_from': 'Everything',
'type': 'appliance',
@ -547,7 +547,7 @@ live_images = [
'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp',
'version': '24_Alpha',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 7,
'repo_from': 'Everything',
'type': 'appliance',

26
fedora-beta.conf
View File

@ -8,7 +8,7 @@ release_is_layered = False
bootable = True
comps_file = 'comps-f24.xml' #{
# 'scm': 'git',
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
# 'repo': 'https://pagure.io/fedora-comps.git',
# 'branch': None, # defaults to cvs/HEAD or git/master
# 'file': 'comps-f23.xml',
#}
@ -282,7 +282,7 @@ image_build = {
'version': '24_Beta',
'release': 1.6,
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -301,7 +301,7 @@ image_build = {
'target': 'f24',
'version': '24_Beta',
'release': 1.6,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -318,7 +318,7 @@ image_build = {
'target': 'f24',
'version': '24_Beta',
'release': 1.6,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
@ -333,7 +333,7 @@ image_build = {
live_media_version = '24_Beta'
live_media_release = '1.6'
live_media_ksurl = 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24'
live_media_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24'
live_media_target = 'f24'
live_media = {
@ -477,7 +477,7 @@ live_images = [
'kickstart': 'fedora-arm-workstation.ks',
'name': 'Fedora-Workstation-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'type': 'appliance'
}
@ -487,7 +487,7 @@ live_images = [
'kickstart': 'fedora-arm-server.ks',
'name': 'Fedora-Server-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'type': 'appliance'
}
@ -497,7 +497,7 @@ live_images = [
'kickstart': 'fedora-arm-kde.ks',
'name': 'Fedora-KDE-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'repo_from': 'Everything',
'type': 'appliance',
@ -507,7 +507,7 @@ live_images = [
'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'repo_from': 'Everything',
'type': 'appliance',
@ -517,7 +517,7 @@ live_images = [
'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'repo_from': 'Everything',
'type': 'appliance',
@ -527,7 +527,7 @@ live_images = [
'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'repo_from': 'Everything',
'type': 'appliance',
@ -537,7 +537,7 @@ live_images = [
'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'repo_from': 'Everything',
'type': 'appliance',
@ -547,7 +547,7 @@ live_images = [
'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp',
'version': '24_Beta',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': 1.6,
'repo_from': 'Everything',
'type': 'appliance',

30
fedora.conf
View File

@ -8,7 +8,7 @@ release_is_layered = False
bootable = True
comps_file = 'comps-f24.xml' #{
# 'scm': 'git',
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
# 'repo': 'https://pagure.io/fedora-comps.git',
# 'branch': None, # defaults to cvs/HEAD or git/master
# 'file': 'comps-f23.xml',
#}
@ -282,7 +282,7 @@ image_build = {
'version': '24',
'release': None,
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -301,7 +301,7 @@ image_build = {
'target': 'f24',
'version': '24',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
@ -318,7 +318,7 @@ image_build = {
'target': 'f24',
'version': '24',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
@ -335,7 +335,7 @@ image_build = {
'target': 'f24',
'version': '24',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-atomic.ks',
'distro': 'Fedora-20',
'disk_size': 6,
@ -352,7 +352,7 @@ image_build = {
'target': 'f24',
'version': '24',
'release': None,
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'kickstart': 'fedora-atomic-vagrant.ks',
'distro': 'Fedora-20',
'disk_size': 40,
@ -367,7 +367,7 @@ image_build = {
live_media_version = '24'
live_media_release = None
live_media_ksurl = 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24'
live_media_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24'
live_media_target = 'f24'
live_media = {
@ -511,7 +511,7 @@ live_images = [
'kickstart': 'fedora-arm-workstation.ks',
'name': 'Fedora-Workstation-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'type': 'appliance'
}
@ -521,7 +521,7 @@ live_images = [
'kickstart': 'fedora-arm-server.ks',
'name': 'Fedora-Server-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'type': 'appliance'
}
@ -531,7 +531,7 @@ live_images = [
'kickstart': 'fedora-arm-kde.ks',
'name': 'Fedora-KDE-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
@ -541,7 +541,7 @@ live_images = [
'kickstart': 'fedora-arm-lxde.ks',
'name': 'Fedora-LXDE-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
@ -551,7 +551,7 @@ live_images = [
'kickstart': 'fedora-arm-mate.ks',
'name': 'Fedora-Mate-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
@ -561,7 +561,7 @@ live_images = [
'kickstart': 'fedora-arm-minimal.ks',
'name': 'Fedora-Minimal-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
@ -571,7 +571,7 @@ live_images = [
'kickstart': 'fedora-arm-soas.ks',
'name': 'Fedora-SoaS-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',
@ -581,7 +581,7 @@ live_images = [
'kickstart': 'fedora-arm-xfce.ks',
'name': 'Fedora-Xfce-armhfp',
'version': '24',
'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#origin/f24',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f24',
'release': None,
'repo_from': 'Everything',
'type': 'appliance',

2
nightly.sh
View File

@ -49,7 +49,7 @@ send_fedmsg "${fedmsg_json_start}" ${DIST} start
pushd $TMPDIR
git clone https://git.fedorahosted.org/git/comps.git && {
git clone https://pagure.io/fedora-comps.git && {
pushd comps
make "${COMPSFILE}"
cp "${COMPSFILE}" $DEST/

2
release-candidate.sh
View File

@ -17,7 +17,7 @@ TMPDIR=`mktemp -d /tmp/f24.$DATE.XXXX`
#COMPOSE_ID="Fedora-23-20150530.n.0"
pushd $TMPDIR
git clone https://git.fedorahosted.org/git/comps.git && {
git clone https://pagure.io/fedora-comps.git && {
pushd comps
make "${COMPSFILE}"
cp "${COMPSFILE}" $DEST/