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

ELN: Test compose with comps.

Browse Source 
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
This commit is contained in:
Jan Kaluza 2020-10-21 13:16:29 +02:00
parent 4f951639e0
commit 5aa0c12053
3 changed files with 136 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fedora/override.conf
View File

@ -22,13 +22,16 @@ pkgset_koji_builds = [
# No jigdo needed in Fedora.
create_jigdo = False
# We only build repositories, installer and images in Fedora so far.
# Generate only repositories for now
skip_phases = [
"createiso",
"buildinstall",
"live_media",
"live_images",
"ostree",
"osbs",
"extra_isos",
"image_build"
]
# Enables macboot on x86_64 for all variants and disables upgrade image building
@ -55,13 +58,6 @@ variant_as_lookaside = [
("CRB", "AppStream"),
]
# TODO: There is no "fus" in Fedora and no comps yet. For now use "json"
# source and "deps" method.
# Generate gather_source.json on-the-fly using the prepopulate scm dict,
# store it into /srv/odcs and use it from there.
gather_source_mapping = "/srv/odcs/gather_source.json"
gather_method = {
'^.*': {
'json': 'deps',

2
fedora/variables.conf
View File

@ -28,7 +28,7 @@ VARIANTS_FILE = "variants.xml"
GATHER_PREPOPULATE_REPO = "https://pagure.io/pungi-fedora.git"
GATHER_PREPOPULATE_BRANCH = "eln"
GATHER_PREPOPULATE_FILE = "prepopulate.json"
GATHER_PREPOPULATE_COMMAND = "echo {} > prepopulate.json; ./content-resolver-to-gather-source-json; cp gather_source.json /srv/odcs"
GATHER_PREPOPULATE_COMMAND = ""
RUNROOT_CHANNEL = "compose"

139
variants.xml
View File

@ -21,6 +21,7 @@
<arch>x86_64</arch>
<arch>i386</arch>
</arches>
<!-- List of comps groups that should be part of BaseOS compose variant -->
<groups>
<!-- Essential groups for Anaconda installation -->
<group default="true">guest-agents</group>
@ -28,7 +29,48 @@
<group default="true">base</group>
<group default="true">core</group>
<!-- Other groups -->
<group default="true">binary-intentionally-in-rhel-8</group>
<group default="true">additional-devel</group>
<group default="false">anaconda-tools</group>
<group default="false">conflicts-baseos</group>
<group default="true">development</group>
<group default="true">server-product</group>
<group default="true">dial-up</group>
<group default="true">networkmanager-submodules</group>
<group default="true">file-server</group>
<group default="true">fonts</group>
<group default="true">gnome-desktop</group>
<group default="true">graphical-admin-tools</group>
<group default="true">hardware-monitoring</group>
<group default="true">hardware-support</group>
<group default="true">infiniband</group>
<group default="true">headless-management</group>
<group default="true">large-systems</group>
<group default="true">legacy-unix</group>
<group default="true">mail-server</group>
<group default="true">mainframe-access</group>
<group default="true">multimedia</group>
<group default="true">dns-server</group>
<group default="true">smart-card</group>
<group default="true">smb-server</group>
<group default="true">network-tools</group>
<group default="true">network-file-system-client</group>
<group default="true">network-server</group>
<group default="true">performance</group>
<group default="true">platform-devel</group>
<group default="true">python-web</group>
<group default="true">remote-system-management</group>
<group default="true">scientific</group>
<group default="true">security-tools</group>
<group default="true">system-tools</group>
<group default="true">workstation-product</group>
</groups>
<!-- List of environments from comps that should be part of BaseOS compose variant -->
<environments>
<environment display_order="3">minimal-environment</environment>
<environment display_order="99">custom-environment</environment>
<environment display_order="2">server-product-environment</environment>
</environments>
</variant>
<variant id="AppStream" name="AppStream" type="variant" has_optional="false">
<arches>
@ -38,9 +80,83 @@
<arch>x86_64</arch>
<arch>i386</arch>
</arches>
<!-- List of comps groups that should be part of AppStream compose variant -->
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">nonmodular-appstream</group>
<group default="true">standard</group>
<group default="false">anaconda-tools</group>
<group default="true">base</group>
<group default="false">conflicts-appstream</group>
<group default="true">core</group>
<group default="true">additional-devel</group>
<group default="true">base-x</group>
<group default="true">debugging</group>
<group default="true">development</group>
<group default="true">dotnet-core</group>
<group default="true">file-server</group>
<group default="true">ftp-server</group>
<group default="true">gnome-apps</group>
<group default="true">gnome-desktop</group>
<group default="true">guest-desktop-agents</group>
<group default="true">graphical-admin-tools</group>
<group default="true">graphics</group>
<group default="true">infiniband</group>
<group default="true">workstation-product</group>
<group default="true">multimedia</group>
<group default="true">mail-server</group>
<group default="true">mainframe-access</group>
<group default="true">network-server</group>
<group default="true">network-tools</group>
<group default="true">container-management</group>
<group default="true">smb-server</group>
<group default="true">dial-up</group>
<group default="true">fonts</group>
<group default="true">input-methods</group>
<group default="true">multimedia</group>
<group default="true">networkmanager-submodules</group>
<group default="true">network-file-system-client</group>
<group default="true">print-client</group>
<group default="true">desktop-debugging</group>
<group default="true">internet-browser</group>
<group default="true">gnome-desktop</group>
<group default="true">guest-agents</group>
<group default="true">guest-desktop-agents</group>
<group default="true">headless-management</group>
<group default="true">java-platform</group>
<group default="true">gnome-apps</group>
<group default="true">internet-applications</group>
<group default="true">office-suite</group>
<group default="true">performance</group>
<group default="true">platform-devel</group>
<group default="true">platform-kvm</group>
<group default="true">platform-microsoft</group>
<group default="true">platform-vmware</group>
<group default="true">scientific</group>
<group default="true">ostree-support</group>
<group default="true">security-tools</group>
<group default="true">smart-card</group>
<group default="true">system-tools</group>
<group default="true">texlive</group>
<group default="true">legacy-x</group>
<group default="true">backup-client</group>
<group default="true">remote-desktop-clients</group>
<group default="true">remote-system-management</group>
<group default="true">rpm-development-tools</group>
<group default="true">virtualization-client</group>
<group default="true">virtualization-hypervisor</group>
<group default="true">virtualization-platform</group>
<group default="true">virtualization-tools</group>
<group default="true">web-server</group>
</groups>
<!-- List of environments from comps that should be part of BaseOS compose variant -->
<environments>
<environment display_order="3">minimal-environment</environment>
<environment display_order="99">virtualization-host-environment</environment>
<environment display_order="99">custom-environment</environment>
<environment display_order="2">server-product-environment</environment>
<environment display_order="1">graphical-server-environment</environment>
<environment display_order="4">workstation-product-environment</environment>
</environments>
<modules>
<module>*</module>
</modules>
@ -54,7 +170,7 @@
<arch>i386</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">codeready-builder</group>
</groups>
</variant>
@ -68,7 +184,9 @@
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">ha</group>
<group default="true">ha-devel</group>
<group default="true">resilient-storage</group>
</groups>
</variant>
@ -80,7 +198,8 @@
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">ha</group>
<group default="true">ha-devel</group>
</groups>
</variant>
@ -94,7 +213,7 @@
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">sap</group>
</groups>
</variant>
@ -104,7 +223,7 @@
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">sap-hana</group>
</groups>
</variant>
@ -113,7 +232,8 @@
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">rt</group>
<group default="true">rt-debug</group>
</groups>
</variant>
@ -122,7 +242,10 @@
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
<group default="true">rt</group>
<group default="true">rt-debug</group>
<group default="true">nfv</group>
<group default="true">nfv-debug</group>
</groups>
</variant>
</variants>