testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-12-18 09:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #205 from tcooper/fix-templates-fif

Browse Source 
fix templates.fif for s390x
This commit is contained in:
Alan Marshall 2024-01-31 14:56:12 +00:00 committed by GitHub
commit 6b0300e77b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fifloader.py
View File

@ -212,6 +212,11 @@ def generate_job_templates(products, profiles, testsuites):
jobtemplate['group_name'] = "Rocky PowerPC Updates" jobtemplate['group_name'] = "Rocky PowerPC Updates"
else: else:
jobtemplate['group_name'] = "Rocky PowerPC" jobtemplate['group_name'] = "Rocky PowerPC"
elif jobtemplate['machine_name'] in ('s390x'):
if 'updates' in product['flavor']:
jobtemplate['group_name'] = "Rocky s390x Updates"
else:
jobtemplate['group_name'] = "Rocky s390x"
elif jobtemplate['machine_name'] in ('aarch64', 'ARM'): elif jobtemplate['machine_name'] in ('aarch64', 'ARM'):
if 'updates' in product['flavor']: if 'updates' in product['flavor']:
jobtemplate['group_name'] = "Rocky AArch64 Updates" jobtemplate['group_name'] = "Rocky AArch64 Updates"

10
templates.fif.json
View File

@ -348,7 +348,7 @@
}, },
"rocky-boot-iso-s390x-*-s390x": { "rocky-boot-iso-s390x-*-s390x": {
"machine": "s390x", "machine": "s390x",
"product": "rocky-boot-iso-ppc64le-*" "product": "rocky-boot-iso-s390x-*"
}, },
"rocky-boot-iso-ppc64le-*-ppc64le": { "rocky-boot-iso-ppc64le-*-ppc64le": {
"machine": "ppc64le", "machine": "ppc64le",
@ -368,7 +368,7 @@
}, },
"rocky-minimal-iso-s390x-*-s390x": { "rocky-minimal-iso-s390x-*-s390x": {
"machine": "s390x", "machine": "s390x",
"product": "rocky-minimal-iso-ppc64le-*" "product": "rocky-minimal-iso-s390x-*"
}, },
"rocky-minimal-iso-ppc64le-*-ppc64le": { "rocky-minimal-iso-ppc64le-*-ppc64le": {
"machine": "ppc64le", "machine": "ppc64le",
@ -384,7 +384,7 @@
}, },
"rocky-dvd-iso-s390x-*-s390x": { "rocky-dvd-iso-s390x-*-s390x": {
"machine": "s390x", "machine": "s390x",
"product": "rocky-dvd-iso-ppc64le-*" "product": "rocky-dvd-iso-s390x-*"
}, },
"rocky-dvd-iso-ppc64le-*-ppc64le": { "rocky-dvd-iso-ppc64le-*-ppc64le": {
"machine": "ppc64le", "machine": "ppc64le",
@ -404,7 +404,7 @@
}, },
"rocky-package-set-s390x-*-s390x": { "rocky-package-set-s390x-*-s390x": {
"machine": "s390x", "machine": "s390x",
"product": "rocky-package-set-ppc64le-*" "product": "rocky-package-set-s390x-*"
}, },
"rocky-package-set-ppc64le-*-ppc64le": { "rocky-package-set-ppc64le-*-ppc64le": {
"machine": "ppc64le", "machine": "ppc64le",
@ -424,7 +424,7 @@
}, },
"rocky-universal-s390x-*-s390x": { "rocky-universal-s390x-*-s390x": {
"machine": "s390x", "machine": "s390x",
"product": "rocky-universal-ppc64le-*" "product": "rocky-universal-s390x-*"
}, },
"rocky-universal-ppc64le-*-ppc64le": { "rocky-universal-ppc64le-*-ppc64le": {
"machine": "ppc64le", "machine": "ppc64le",