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

ELN: Add modules from eln-modular tag to AppStream variant.

Browse Source 
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
This commit is contained in:
Jan Kaluza 2020-10-06 09:29:55 +02:00
parent c58ebdf3a0
commit 9d29d85adc
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fedora/override.conf
View File

@ -49,7 +49,7 @@ buildinstall_skip = [
'ppc64le': True,
's390x': True
}),
("^(Modular|AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
("^(AppStream|CRB|ResilientStorage|HighAvailability|SAP|SAPHANA|RT|NFV)$", {
'*': True
}),
]
@ -100,7 +100,14 @@ gather_prepopulate = {
'command': "echo {} > prepopulate.json; ./content-resolver-to-gather-source-json; cp gather_source.json /srv/odcs"
}
gather_source_mapping = "/srv/odcs/gather_source.json"
gather_method = "deps"
gather_method = {
'^.*': {
'json': 'deps',
'comps': 'deps',
'module': 'nodeps',
}
}
# No product_id for Fedora.
product_id_allow_missing = False

5
fedora/variables.conf
View File

@ -15,7 +15,7 @@ COMPS_COMMAND = "make comps-rawhide.xml"
MODULE_DEFAULTS_REPO = "https://pagure.io/releng/fedora-module-defaults.git"
MODULE_DEFAULTS_BRANCH = "master"
MODULE_DEFAULTS_BRANCH = "eln"
VARIANTS_REPO = "https://pagure.io/pungi-fedora.git"
@ -33,5 +33,4 @@ RUNROOT_TAG = "eln-build"
PKGSET_KOJI_TAG = "eln"
PKGSET_KOJI_MODULE_TAG = ""
PKGSET_KOJI_MODULE_TAG = "eln-modular"

15
variants.xml
View File

@ -13,18 +13,6 @@
<arch>i386</arch>
</arches>
</variant>
<variant id="Modular" name="Modular" type="variant">
<arches>
<arch>aarch64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
<arch>i386</arch>
</arches>
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
</groups>
</variant>
<variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
<arches>
<arch>aarch64</arch>
@ -48,6 +36,9 @@
<groups>
<group default="true">we-do-not-have-comps-xml-yet</group>
</groups>
<modules>
<module>*</module>
</modules>
</variant>
<variant id="CRB" name="CodeReady Builder" type="variant" is_empty="true">
<arches>