| |
@@ -1,21 +1,10 @@
|
| |
# PRODUCT INFO
|
| |
- release_name = 'Fedora-Atomic'
|
| |
- release_short = 'Fedora-Atomic'
|
| |
+ release_name = 'Fedora-Cloud'
|
| |
+ release_short = 'Fedora-Cloud'
|
| |
release_version = '26'
|
| |
release_is_layered = False
|
| |
# GENERAL SETTINGS
|
| |
- bootable = True
|
| |
- buildinstall_method = 'lorax'
|
| |
- lorax_options = [
|
| |
- ('^.*$', {
|
| |
- 'x86_64': {
|
| |
- 'nomacboot': True
|
| |
- }
|
| |
- '*': {
|
| |
- 'noupgrade': True
|
| |
- }
|
| |
- })
|
| |
- ]
|
| |
+ bootable = False
|
| |
comps_file = 'comps-f26.xml' #{
|
| |
# 'scm': 'git',
|
| |
# 'repo': 'git://git.fedorahosted.org/git/comps.git',
|
| |
@@ -29,7 +18,7 @@
|
| |
tree_arches = ['x86_64']
|
| |
# limit tree variants
|
| |
# if undefined, all variants from variants.xml will be included
|
| |
- tree_variants = ['Atomic', 'Cloud', 'CloudImages']
|
| |
+ tree_variants = ['CloudImages']
|
| |
hashed_directories = True
|
| |
# RUNROOT settings
|
| |
runroot = True
|
| |
@@ -38,7 +27,7 @@
|
| |
runroot_tag = 'f26-build'
|
| |
# PKGSET
|
| |
pkgset_source = 'koji' # koji, repos
|
| |
- pkgset_koji_tag = 'f26-atomic'
|
| |
+ pkgset_koji_tag = 'f26-updates'
|
| |
pkgset_koji_inherit = True
|
| |
filter_system_release_packages = False
|
| |
# GATHER
|
| |
@@ -185,7 +174,6 @@
|
| |
image_volid_layered_product_formats = []
|
| |
# Replace 'Cloud' with 'C' in volume id etc.
|
| |
volume_id_substitutions = {
|
| |
- 'Atomic': 'AH',
|
| |
'Rawhide': 'rawh',
|
| |
'Images': 'img',
|
| |
'MATE_Compiz': 'MATE',
|
| |
@@ -216,70 +204,44 @@
|
| |
'^CloudImages$': [
|
| |
{
|
| |
'image-build': {
|
| |
- 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
|
| |
- 'name': 'Fedora-Atomic',
|
| |
+ 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
|
| |
+ 'name': 'Fedora-Cloud-Base',
|
| |
'target': 'f26',
|
| |
'version': '26',
|
| |
'release': None,
|
| |
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
| |
- 'kickstart': 'fedora-atomic.ks',
|
| |
- 'distro': 'Fedora-20',
|
| |
- 'disk_size': 6,
|
| |
+ 'kickstart': 'fedora-cloud-base.ks',
|
| |
+ 'distro': 'Fedora-22',
|
| |
+ 'disk_size': 4,
|
| |
'arches': ['x86_64'],
|
| |
- 'repo_from': 'Cloud',
|
| |
'repo': [
|
| |
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
|
| |
+ 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
|
| |
],
|
| |
- 'install_tree_from': 'Cloud',
|
| |
- 'subvariant': 'Atomic'
|
| |
+ 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
|
| |
+ 'subvariant': 'Cloud_Base'
|
| |
}
|
| |
},
|
| |
{
|
| |
'image-build': {
|
| |
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
|
| |
- 'name': 'Fedora-Atomic-Vagrant',
|
| |
+ 'name': 'Fedora-Cloud-Base-Vagrant',
|
| |
'target': 'f26',
|
| |
'version': '26',
|
| |
'release': None,
|
| |
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
|
| |
- 'kickstart': 'fedora-atomic-vagrant.ks',
|
| |
- 'distro': 'Fedora-20',
|
| |
+ 'kickstart': 'fedora-cloud-base-vagrant.ks',
|
| |
+ 'distro': 'Fedora-22',
|
| |
'disk_size': 40,
|
| |
'arches': ['x86_64'],
|
| |
- 'repo_from': 'Cloud',
|
| |
'repo': [
|
| |
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
|
| |
+ 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/'
|
| |
],
|
| |
- 'install_tree_from': 'Cloud',
|
| |
- 'subvariant': 'Atomic'
|
| |
+ 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',
|
| |
+ 'subvariant': 'Cloud_Base',
|
| |
}
|
| |
- }
|
| |
+ },
|
| |
],
|
| |
}
|
| |
- ostree_installer = [
|
| |
- ("^Atomic$", {
|
| |
- "x86_64": {
|
| |
- "source_repo_from": [ "Cloud",
|
| |
- "https://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/"],
|
| |
- "release": None,
|
| |
- "installpkgs": ["fedora-productimg-atomic"],
|
| |
- "add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
|
| |
- "add_template_var": [
|
| |
- "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
|
| |
- "ostree_osname=fedora-atomic",
|
| |
- "ostree_install_ref=fedora/26/x86_64/updates/atomic-host",
|
| |
- "ostree_update_ref=fedora/26/x86_64/atomic-host",
|
| |
- ],
|
| |
- "add_arch_template": ["atomic-installer/lorax-embed-repo.tmpl"],
|
| |
- "add_arch_template_var": [
|
| |
- "ostree_repo=https://kojipkgs.fedoraproject.org/atomic/26/",
|
| |
- "ostree_osname=fedora-atomic",
|
| |
- "ostree_install_ref=fedora/26/x86_64/updates/atomic-host",
|
| |
- "ostree_update_ref=fedora/26/x86_64/atomic-host",
|
| |
- ]
|
| |
- 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
|
| |
- 'template_branch': 'f26',
|
| |
- }
|
| |
- })
|
| |
- ]
|
| |
koji_profile = 'compose_koji'
|
| |
walters commented 6 years ago
Isn't this URL wrong before a release?