testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

swap rocky and fedora fifloader.py

Browse Source
This commit is contained in:
Trevor Cooper 2021-08-09 22:02:20 -07:00
parent 7995d27282
commit 99e435f8a2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fifloader-rocky.py → fifloader-fedora.py
View File

@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# Author: Adam Williamson <awilliam@redhat.com> # Author: Adam Williamson <awilliam@redhat.com>
# Modified: Trevor Cooper <tcooper@rockylinux.org>
"""This is an openQA template loader/converter for FIF, the Fedora Intermediate Format. It reads """This is an openQA template loader/converter for FIF, the Fedora Intermediate Format. It reads
from one or more files expected to contain FIF JSON-formatted template data; read on for details from one or more files expected to contain FIF JSON-formatted template data; read on for details
@ -200,7 +199,7 @@ def generate_job_templates(products, profiles, testsuites):
for (profile, prio) in suite['profiles'].items(): for (profile, prio) in suite['profiles'].items():
jobtemplate = {'test_suite_name': name, 'prio': prio} jobtemplate = {'test_suite_name': name, 'prio': prio}
# x86_64 compose # x86_64 compose
jobtemplate['group_name'] = 'Rocky' jobtemplate['group_name'] = 'fedora'
jobtemplate['machine_name'] = profiles[profile]['machine'] jobtemplate['machine_name'] = profiles[profile]['machine']
product = products[profiles[profile]['product']] product = products[profiles[profile]['product']]
jobtemplate['arch'] = product['arch'] jobtemplate['arch'] = product['arch']
@ -209,17 +208,17 @@ def generate_job_templates(products, profiles, testsuites):
jobtemplate['version'] = product['version'] jobtemplate['version'] = product['version']
if jobtemplate['machine_name'] == 'ppc64le': if jobtemplate['machine_name'] == 'ppc64le':
if 'updates' in product['flavor']: if 'updates' in product['flavor']:
jobtemplate['group_name'] = "Rocky PowerPC Updates" jobtemplate['group_name'] = "Fedora PowerPC Updates"
else: else:
jobtemplate['group_name'] = "Rocky PowerPC" jobtemplate['group_name'] = "Fedora PowerPC"
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'] = "Fedora AArch64 Updates"
else: else:
jobtemplate['group_name'] = "Rocky AArch64" jobtemplate['group_name'] = "Fedora AArch64"
elif 'updates' in product['flavor']: elif 'updates' in product['flavor']:
# x86_64 updates # x86_64 updates
jobtemplate['group_name'] = "Rocky Updates" jobtemplate['group_name'] = "Fedora Updates"
jobtemplates.append(jobtemplate) jobtemplates.append(jobtemplate)
return jobtemplates return jobtemplates

13
fifloader.py
View File

@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
# Author: Adam Williamson <awilliam@redhat.com> # Author: Adam Williamson <awilliam@redhat.com>
# Modified: Trevor Cooper <tcooper@rockylinux.org>
"""This is an openQA template loader/converter for FIF, the Fedora Intermediate Format. It reads """This is an openQA template loader/converter for FIF, the Fedora Intermediate Format. It reads
from one or more files expected to contain FIF JSON-formatted template data; read on for details from one or more files expected to contain FIF JSON-formatted template data; read on for details
@ -199,7 +200,7 @@ def generate_job_templates(products, profiles, testsuites):
for (profile, prio) in suite['profiles'].items(): for (profile, prio) in suite['profiles'].items():
jobtemplate = {'test_suite_name': name, 'prio': prio} jobtemplate = {'test_suite_name': name, 'prio': prio}
# x86_64 compose # x86_64 compose
jobtemplate['group_name'] = 'fedora' jobtemplate['group_name'] = 'Rocky'
jobtemplate['machine_name'] = profiles[profile]['machine'] jobtemplate['machine_name'] = profiles[profile]['machine']
product = products[profiles[profile]['product']] product = products[profiles[profile]['product']]
jobtemplate['arch'] = product['arch'] jobtemplate['arch'] = product['arch']
@ -208,17 +209,17 @@ def generate_job_templates(products, profiles, testsuites):
jobtemplate['version'] = product['version'] jobtemplate['version'] = product['version']
if jobtemplate['machine_name'] == 'ppc64le': if jobtemplate['machine_name'] == 'ppc64le':
if 'updates' in product['flavor']: if 'updates' in product['flavor']:
jobtemplate['group_name'] = "Fedora PowerPC Updates" jobtemplate['group_name'] = "Rocky PowerPC Updates"
else: else:
jobtemplate['group_name'] = "Fedora PowerPC" jobtemplate['group_name'] = "Rocky PowerPC"
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'] = "Fedora AArch64 Updates" jobtemplate['group_name'] = "Rocky AArch64 Updates"
else: else:
jobtemplate['group_name'] = "Fedora AArch64" jobtemplate['group_name'] = "Rocky AArch64"
elif 'updates' in product['flavor']: elif 'updates' in product['flavor']:
# x86_64 updates # x86_64 updates
jobtemplate['group_name'] = "Fedora Updates" jobtemplate['group_name'] = "Rocky Updates"
jobtemplates.append(jobtemplate) jobtemplates.append(jobtemplate)
return jobtemplates return jobtemplates