PR#1257: F40: Switch Fedora Cloud and Container beta builds to use kiwibuild - pungi-fedora

pungi-fedora

#1257 F40: Switch Fedora Cloud and Container beta builds to use kiwibuild

Merged 3 months ago by jnsamyak. Opened 3 months ago by ngompa.

ngompa/pungi-fedora f40-beta-sweetened-images into f40

Switch Fedora Cloud and Container beta builds to use kiwibuild

Neal Gompa • 3 months ago

5b7d0d5

fedora-beta.conf

file modified

+94 -128

		`@@ -204,136 +204,11 @@`
		`global_version = '40_Beta'`
		`# live_images ignores this in favor of live_target`
		`global_target = 'f40'`
		`+ # kiwi images need another target that uses old mock chroot`
		`+ kiwibuild_target = 'f40-kiwi'`
		`+`

		`image_build = {`
		`- '^Container$': [`
		`- {`
		`- 'image-build': {`
		`- 'format': [('docker', 'tar.xz')],`
		`- 'name': 'Fedora-Container-Base',`
		`- 'kickstart': 'fedora-container-base.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 5,`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Container_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- 'factory-parameters': {`
		`- 'dockerversion': "1.10.1",`
		`- 'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',`
		`- },`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('docker', 'tar.xz')],`
		`- 'name': 'Fedora-Container-Minimal-Base',`
		`- 'kickstart': 'fedora-container-base-minimal.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 5,`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Container_Minimal_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- 'factory-parameters': {`
		`- 'dockerversion': "1.10.1",`
		`- 'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',`
		`- },`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('docker', 'tar.xz')],`
		`- 'name': 'Fedora-Container-Toolbox',`
		`- 'kickstart': 'fedora-container-toolbox.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 5,`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Container_Toolbox',`
		`- 'failable': [''],`
		`- },`
		`- 'factory-parameters': {`
		`- 'dockerversion': "1.10.1",`
		`- 'docker_cmd': '[ "/bin/bash" ]',`
		`- 'docker_env': '[ "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',`
		`- },`
		`- }`
		`- ],`
		`- '^Cloud$': [`
		`- {`
		`- 'image-build': {`
		`- 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],`
		`- 'name': 'Fedora-Cloud-Base',`
		`- 'kickstart': 'fedora-cloud-base.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 5,`
		`- 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['ppc64le', 's390x'],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('tar-gz', 'tar.gz')],`
		`- 'name': 'Fedora-Cloud-Base-GCP',`
		`- 'kickstart': 'fedora-cloud-base-gcp.ks',`
		- # Use `Fedora-30` profile here because we need it
		`- # to be a UEFI image and currently OZ does that if`
		- # we use the `Fedora-30` profile.
		`- 'distro': 'Fedora-30',`
		`- # GCP engineers have told me the disk images have bad`
		`- # performance if they are anything less than 10G`
		`- 'disk_size': 10,`
		`- 'arches': ['x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['x86_64'],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('vpc','vpc')],`
		`- 'name': 'Fedora-Cloud-Base-Azure',`
		`- 'kickstart': 'fedora-cloud-base-azure.ks',`
		- # Use `Fedora-30` profile here because we need it
		`- # to be a UEFI image and currently OZ does that if`
		- # we use the `Fedora-30` profile.
		`- 'distro': 'Fedora-30',`
		`- 'disk_size': 5,`
		`- 'arches': ['aarch64', 'x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- }`
		`- },`
		`- {`
		`- 'image-build': {`
		`- 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],`
		`- 'name': 'Fedora-Cloud-Base-Vagrant',`
		`- 'kickstart': 'fedora-cloud-base-vagrant.ks',`
		`- 'distro': 'Fedora-22',`
		`- 'disk_size': 40,`
		`- 'arches': ['x86_64'],`
		`- 'repo': 'Everything',`
		`- 'install_tree_from': 'Everything',`
		`- 'subvariant': 'Cloud_Base',`
		`- 'failable': ['*'],`
		`- },`
		`- },`
		`- ],`
		`'^Labs$': [`
		`{`
		`'image-build': {`
		`@@ -504,6 +379,97 @@`
		`],`
		`}`

		`+ kiwibuild = {`
		`+ '^Cloud$': [`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Cloud-Base-Generic',`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Cloud_Base',`
		`+ 'failable': ['ppc64le', 's390x'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Cloud-Base-AmazonEC2',`
		`+ 'arches': ['aarch64', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Cloud_Base',`
		`+ 'failable': ['*'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Cloud-Base-Azure',`
		`+ 'arches': ['aarch64', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Cloud_Base',`
		`+ 'failable': ['*'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Cloud-Base-GCE',`
		`+ 'arches': ['aarch64', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Cloud_Base',`
		`+ 'failable': ['*'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Cloud-Base-Vagrant-libvirt',`
		`+ 'arches': ['aarch64', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Cloud_Base',`
		`+ 'failable': ['*'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Cloud-Base-Vagrant-VirtualBox',`
		`+ 'arches': ['x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Cloud_Base',`
		`+ 'failable': ['*'],`
		`+ }`
		`+ ],`
		`+ '^Container$': [`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Container-Base-Generic',`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Container_Base',`
		`+ 'target': global_target,`
		`+ 'failable': ['*'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Container-Base-Generic-Minimal',`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Container_Minimal_Base',`
		`+ 'target': global_target,`
		`+ 'failable': ['*'],`
		`+ },`
		`+ {`
		`+ 'description_scm': 'git+https://pagure.io/fedora-kiwi-descriptions.git?#origin/f40',`
		`+ 'description_path': 'Fedora.kiwi',`
		`+ 'kiwi_profile': 'Container-Toolbox',`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'repos': ['Everything'],`
		`+ 'subvariant': 'Container_Toolbox',`
		`+ 'target': global_target,`
		`+ 'failable': [''],`
		`+ }`
		`+ ],`
		`+ }`
		`+`
		`live_media = {`
		`'^Workstation$': [`
		`{`