PR#902: ELN: Add modules from eln-modular tag to AppStream variant. - pungi-fedora

Jan Kaluza • 3 years ago

9d29d85

fedora/override.conf

file modified

+9 -2

		`@@ -49,7 +49,7 @@`
		`'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 @@`
		`'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`

fedora/variables.conf

file modified

+2 -3

		`@@ -15,7 +15,7 @@`


		`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 @@`


		`PKGSET_KOJI_TAG = "eln"`
		`- PKGSET_KOJI_MODULE_TAG = ""`
		`-`
		`+ PKGSET_KOJI_MODULE_TAG = "eln-modular"`

variants.xml

file modified

+3 -12

		`@@ -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>`