repoint rawhide
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
parent
cbaae50667
commit
79295c89fd
40
fedora.conf
40
fedora.conf
@ -32,7 +32,7 @@ hashed_directories = True
|
|||||||
runroot = True
|
runroot = True
|
||||||
#runroot_channel = "fedora_compose"
|
#runroot_channel = "fedora_compose"
|
||||||
runroot_channel = "compose"
|
runroot_channel = "compose"
|
||||||
runroot_tag = "f24-build"
|
runroot_tag = "f25-build"
|
||||||
|
|
||||||
# PKGSET
|
# PKGSET
|
||||||
pkgset_source = "koji" # koji, repos
|
pkgset_source = "koji" # koji, repos
|
||||||
@ -44,7 +44,7 @@ pkgset_source = "koji" # koji, 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 = "f24"
|
pkgset_koji_tag = "f25"
|
||||||
pkgset_koji_inherit = False
|
pkgset_koji_inherit = False
|
||||||
|
|
||||||
filter_system_release_packages = False
|
filter_system_release_packages = False
|
||||||
@ -261,7 +261,7 @@ image_build = {
|
|||||||
'image-build': {
|
'image-build': {
|
||||||
'format': [('docker', 'tar.xz')]
|
'format': [('docker', 'tar.xz')]
|
||||||
'name': 'Fedora-Docker-Base',
|
'name': 'Fedora-Docker-Base',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
'release': None,
|
'release': None,
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
@ -280,7 +280,7 @@ image_build = {
|
|||||||
'image-build': {
|
'image-build': {
|
||||||
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
|
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
|
||||||
'name': 'Fedora-Cloud-Base',
|
'name': 'Fedora-Cloud-Base',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
'release': None,
|
'release': None,
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -296,7 +296,7 @@ image_build = {
|
|||||||
'image-build': {
|
'image-build': {
|
||||||
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
||||||
'name': 'Fedora-Cloud-Base-Vagrant',
|
'name': 'Fedora-Cloud-Base-Vagrant',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
'release': None,
|
'release': None,
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -316,7 +316,7 @@ live_media = {
|
|||||||
'^Workstation$': [
|
'^Workstation$': [
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Workstation',
|
'name': 'Fedora-Live-Workstation',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -329,7 +329,7 @@ live_media = {
|
|||||||
'^Spins': [
|
'^Spins': [
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-KDE',
|
'name': 'Fedora-Live-KDE',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -341,7 +341,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Xfce',
|
'name': 'Fedora-Live-Xfce',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -353,7 +353,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-SoaS',
|
'name': 'Fedora-Live-SoaS',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -365,7 +365,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Cinnamon',
|
'name': 'Fedora-Live-Cinnamon',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -377,7 +377,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-LXDE',
|
'name': 'Fedora-Live-LXDE',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -389,7 +389,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-MATE_Compiz',
|
'name': 'Fedora-Live-MATE_Compiz',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -403,7 +403,7 @@ live_media = {
|
|||||||
'^Labs$': [
|
'^Labs$': [
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Astronomy_KDE',
|
'name': 'Fedora-Live-Astronomy_KDE',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -415,7 +415,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Design_suite',
|
'name': 'Fedora-Live-Design_suite',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -427,7 +427,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Scientific_KDE',
|
'name': 'Fedora-Live-Scientific_KDE',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -439,7 +439,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Games',
|
'name': 'Fedora-Live-Games',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -451,7 +451,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Security',
|
'name': 'Fedora-Live-Security',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -463,7 +463,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Jam_KDE',
|
'name': 'Fedora-Live-Jam_KDE',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -475,7 +475,7 @@ live_media = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
'name': 'Fedora-Live-Robotics',
|
'name': 'Fedora-Live-Robotics',
|
||||||
'target': 'f24',
|
'target': 'f25',
|
||||||
'version': 'Rawhide',
|
'version': 'Rawhide',
|
||||||
# correct SHA1 hash will be put into the URL below automatically
|
# correct SHA1 hash will be put into the URL below automatically
|
||||||
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
|
||||||
@ -498,7 +498,7 @@ failable_deliverables = [
|
|||||||
})
|
})
|
||||||
]
|
]
|
||||||
|
|
||||||
live_target = 'f24'
|
live_target = 'f25'
|
||||||
live_images_no_rename = True
|
live_images_no_rename = True
|
||||||
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
# fomat: [(variant_uid_regex, {arch|*: scm_dict})]
|
||||||
live_images = [
|
live_images = [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user