Add a whole intermediate template format ('FIF') and tools
I and @lruzicka (and I think @jskladan and @jsedlak and
@michelmno and everyone else who's ever touched it...) are being
gradually driven nuts by manually editing the test templates.
The bigger the files get the more awkward it is to keep them
straight and be sure we're doing it right. Upstream doesn't do
things the same way we do (they mostly edit in the web UI and
dump to file for the record), but we do still think making
changes in the repo and posting to the web UI is the right way
around to do it, we just wish the format was saner.
Upstream has actually recently introduced a YAML-based approach
to storing job templates which tries to condense things a bit,
and you can dump to that format with dump-templates --json, but
@lruzicka and I agree that that format is barely better for
hand editing in a text editor than the older one our templates
currently use.
So, this commit introduces...Fedora Intermediate Format (FIF) -
an alternative format for representing job templates - and some
tools for working with it. It also contains our existing
templates in this new format, and removes the old template files.
The format is documented in the docstrings of the tools, but
briefly, it keeps Machines, Products and TestSuites but improves
their format a bit (by turning dicts-of-lists into dicts-of-
dicts), and adds Profiles, which are combinations of Machines and
Products. TestSuites can indicate which Profiles they should be
run on.
The intermediate format converter (`fifconverter`) converts
existing template data (in JSON format; use tojson.pm to convert
our perl templates to JSON) to the intermediate format and
writes it out. As this was really intended only for one-time use
(the idea is that after one-time conversion, we will edit the
templates in the intermediate format from now on), its operation
is hardcoded and relies on specific filenames.
The intermediate format loader (`fifloader`) generates
JobTemplates from the TestSuites and Profiles, reverses the
quality-of-life improvements of the intermediate format, and
produces template data compatible with the upstream loader, then
can write it to disk and/or call the upstream loader directly.
The check script (`fifcheck`) runs existing template data through
both the converter and the loader, then checks that the result is
equivalent to the input. Again this was mostly written for one-
time use so is fairly rough and hard-coded, but I'm including it
in the commit so others can check the work and so on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-01-23 14:20:10 +00:00
|
|
|
{
|
|
|
|
|
"Products": {
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-everything-boot-iso",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-kde-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-kde",
|
|
|
|
|
"settings": {
|
|
|
|
|
"DESKTOP": "kde"
|
|
|
|
|
},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-aarch64-*": {
|
|
|
|
|
"arch": "aarch64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-server",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-ppc64le-*": {
|
|
|
|
|
"arch": "ppc64le",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-server",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-upgrade-aarch64-*": {
|
|
|
|
|
"arch": "aarch64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-server-upgrade",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-upgrade-ppc64le-*": {
|
|
|
|
|
"arch": "ppc64le",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-server-upgrade",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-upgrade-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-server-upgrade",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-server",
|
|
|
|
|
"settings": {},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-live-iso-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-workstation-live-iso",
|
|
|
|
|
"settings": {
|
|
|
|
|
"DESKTOP": "gnome",
|
|
|
|
|
"LIVE": "1",
|
|
|
|
|
"PACKAGE_SET": "default"
|
|
|
|
|
},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-upgrade-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-workstation-upgrade",
|
|
|
|
|
"settings": {
|
|
|
|
|
"DESKTOP": "gnome"
|
|
|
|
|
},
|
|
|
|
|
"version": "*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-x86_64-*": {
|
|
|
|
|
"arch": "x86_64",
|
|
|
|
|
"distri": "fedora",
|
|
|
|
|
"flavor": "updates-workstation",
|
|
|
|
|
"settings": {
|
|
|
|
|
"DESKTOP": "gnome"
|
|
|
|
|
},
|
|
|
|
|
"version": "*"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"Profiles": {
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-everything-boot-iso-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*-uefi": {
|
|
|
|
|
"machine": "uefi",
|
|
|
|
|
"product": "fedora-updates-everything-boot-iso-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-kde-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": {
|
|
|
|
|
"machine": "aarch64",
|
|
|
|
|
"product": "fedora-updates-server-aarch64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": {
|
|
|
|
|
"machine": "ppc64le",
|
|
|
|
|
"product": "fedora-updates-server-ppc64le-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-upgrade-ppc64le-*-ppc64le": {
|
|
|
|
|
"machine": "ppc64le",
|
|
|
|
|
"product": "fedora-updates-server-upgrade-ppc64le-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-upgrade-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-server-upgrade-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-server-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-live-iso-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-workstation-live-iso-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-live-iso-x86_64-*-uefi": {
|
|
|
|
|
"machine": "uefi",
|
|
|
|
|
"product": "fedora-updates-workstation-live-iso-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-upgrade-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-workstation-upgrade-x86_64-*"
|
|
|
|
|
},
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": {
|
|
|
|
|
"machine": "64bit",
|
|
|
|
|
"product": "fedora-updates-workstation-x86_64-*"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"TestSuites": {
|
|
|
|
|
"advisory_boot": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
},
|
|
|
|
|
"settings": {
|
|
|
|
|
"ADVISORY_BOOT_TEST": "1",
|
|
|
|
|
"BOOTFROM": "c",
|
|
|
|
|
"ROOT_PASSWORD": "weakpassword",
|
|
|
|
|
"USER_LOGIN": "false"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"base_selinux": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 42,
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"base_service_manipulation": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 42,
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"base_services_start": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 42,
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"base_update_cli": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 42,
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
2020-01-24 15:29:02 +00:00
|
|
|
"base_reboot_unmount": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 42,
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"base_system_logging": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 42,
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
Add a whole intermediate template format ('FIF') and tools
I and @lruzicka (and I think @jskladan and @jsedlak and
@michelmno and everyone else who's ever touched it...) are being
gradually driven nuts by manually editing the test templates.
The bigger the files get the more awkward it is to keep them
straight and be sure we're doing it right. Upstream doesn't do
things the same way we do (they mostly edit in the web UI and
dump to file for the record), but we do still think making
changes in the repo and posting to the web UI is the right way
around to do it, we just wish the format was saner.
Upstream has actually recently introduced a YAML-based approach
to storing job templates which tries to condense things a bit,
and you can dump to that format with dump-templates --json, but
@lruzicka and I agree that that format is barely better for
hand editing in a text editor than the older one our templates
currently use.
So, this commit introduces...Fedora Intermediate Format (FIF) -
an alternative format for representing job templates - and some
tools for working with it. It also contains our existing
templates in this new format, and removes the old template files.
The format is documented in the docstrings of the tools, but
briefly, it keeps Machines, Products and TestSuites but improves
their format a bit (by turning dicts-of-lists into dicts-of-
dicts), and adds Profiles, which are combinations of Machines and
Products. TestSuites can indicate which Profiles they should be
run on.
The intermediate format converter (`fifconverter`) converts
existing template data (in JSON format; use tojson.pm to convert
our perl templates to JSON) to the intermediate format and
writes it out. As this was really intended only for one-time use
(the idea is that after one-time conversion, we will edit the
templates in the intermediate format from now on), its operation
is hardcoded and relies on specific filenames.
The intermediate format loader (`fifloader`) generates
JobTemplates from the TestSuites and Profiles, reverses the
quality-of-life improvements of the intermediate format, and
produces template data compatible with the upstream loader, then
can write it to disk and/or call the upstream loader directly.
The check script (`fifcheck`) runs existing template data through
both the converter and the loader, then checks that the result is
equivalent to the input. Again this was mostly written for one-
time use so is fairly rough and hard-coded, but I'm including it
in the commit so others can check the work and so on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-01-23 14:20:10 +00:00
|
|
|
"desktop_background": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 32,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"desktop_browser": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 32,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"desktop_printing": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 32,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"desktop_terminal": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 32,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"desktop_update_graphical": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-kde-x86_64-*-64bit": 32,
|
|
|
|
|
"fedora-updates-workstation-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"install_default_update_live": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-workstation-live-iso-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-workstation-live-iso-x86_64-*-uefi": 41
|
|
|
|
|
},
|
|
|
|
|
"settings": {
|
|
|
|
|
"+START_AFTER_TEST": "live_build@%ARCH_BASE_MACHINE%",
|
|
|
|
|
"INSTALL": "1",
|
|
|
|
|
"ISO": "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"install_default_update_netinst": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*-64bit": 40,
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*-uefi": 41
|
|
|
|
|
},
|
|
|
|
|
"settings": {
|
|
|
|
|
"+START_AFTER_TEST": "installer_build@%ARCH_BASE_MACHINE%",
|
2020-07-17 20:42:48 +00:00
|
|
|
"ADD_REPOSITORY_VARIATION": "nfs://172.16.2.110:/opt/update_repo",
|
Add a whole intermediate template format ('FIF') and tools
I and @lruzicka (and I think @jskladan and @jsedlak and
@michelmno and everyone else who's ever touched it...) are being
gradually driven nuts by manually editing the test templates.
The bigger the files get the more awkward it is to keep them
straight and be sure we're doing it right. Upstream doesn't do
things the same way we do (they mostly edit in the web UI and
dump to file for the record), but we do still think making
changes in the repo and posting to the web UI is the right way
around to do it, we just wish the format was saner.
Upstream has actually recently introduced a YAML-based approach
to storing job templates which tries to condense things a bit,
and you can dump to that format with dump-templates --json, but
@lruzicka and I agree that that format is barely better for
hand editing in a text editor than the older one our templates
currently use.
So, this commit introduces...Fedora Intermediate Format (FIF) -
an alternative format for representing job templates - and some
tools for working with it. It also contains our existing
templates in this new format, and removes the old template files.
The format is documented in the docstrings of the tools, but
briefly, it keeps Machines, Products and TestSuites but improves
their format a bit (by turning dicts-of-lists into dicts-of-
dicts), and adds Profiles, which are combinations of Machines and
Products. TestSuites can indicate which Profiles they should be
run on.
The intermediate format converter (`fifconverter`) converts
existing template data (in JSON format; use tojson.pm to convert
our perl templates to JSON) to the intermediate format and
writes it out. As this was really intended only for one-time use
(the idea is that after one-time conversion, we will edit the
templates in the intermediate format from now on), its operation
is hardcoded and relies on specific filenames.
The intermediate format loader (`fifloader`) generates
JobTemplates from the TestSuites and Profiles, reverses the
quality-of-life improvements of the intermediate format, and
produces template data compatible with the upstream loader, then
can write it to disk and/or call the upstream loader directly.
The check script (`fifcheck`) runs existing template data through
both the converter and the loader, then checks that the result is
equivalent to the input. Again this was mostly written for one-
time use so is fairly rough and hard-coded, but I'm including it
in the commit so others can check the work and so on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-01-23 14:20:10 +00:00
|
|
|
"INSTALL": "1",
|
|
|
|
|
"INSTALL_UNLOCK": "support_ready",
|
|
|
|
|
"ISO": "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso",
|
|
|
|
|
"NICTYPE": "tap",
|
|
|
|
|
"PACKAGE_SET": "default",
|
|
|
|
|
"PARALLEL_WITH": "support_server@%ARCH_BASE_MACHINE%",
|
|
|
|
|
"WORKER_CLASS": "tap"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"installer_build": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*-64bit": 40
|
|
|
|
|
},
|
|
|
|
|
"settings": {
|
|
|
|
|
"BOOTFROM": "c",
|
|
|
|
|
"HDD_1": "disk_f%VERSION%_minimal_3_%ARCH%.img",
|
|
|
|
|
"NUMDISKS": "2",
|
|
|
|
|
"POSTINSTALL": "_installer_build",
|
|
|
|
|
"ROOT_PASSWORD": "weakpassword",
|
|
|
|
|
"USER_LOGIN": "false"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"live_build": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-workstation-live-iso-x86_64-*-64bit": 40
|
|
|
|
|
},
|
|
|
|
|
"settings": {
|
|
|
|
|
"+DESKTOP": "",
|
|
|
|
|
"+LIVE": "",
|
|
|
|
|
"BOOTFROM": "c",
|
|
|
|
|
"GRUB_POSTINSTALL": "selinux=0",
|
|
|
|
|
"HDD_1": "disk_f%VERSION%_minimal_3_%ARCH%.img",
|
2020-05-06 04:12:12 +00:00
|
|
|
"HDDSIZEGB_3": "25",
|
|
|
|
|
"NUMDISKS": "3",
|
Add a whole intermediate template format ('FIF') and tools
I and @lruzicka (and I think @jskladan and @jsedlak and
@michelmno and everyone else who's ever touched it...) are being
gradually driven nuts by manually editing the test templates.
The bigger the files get the more awkward it is to keep them
straight and be sure we're doing it right. Upstream doesn't do
things the same way we do (they mostly edit in the web UI and
dump to file for the record), but we do still think making
changes in the repo and posting to the web UI is the right way
around to do it, we just wish the format was saner.
Upstream has actually recently introduced a YAML-based approach
to storing job templates which tries to condense things a bit,
and you can dump to that format with dump-templates --json, but
@lruzicka and I agree that that format is barely better for
hand editing in a text editor than the older one our templates
currently use.
So, this commit introduces...Fedora Intermediate Format (FIF) -
an alternative format for representing job templates - and some
tools for working with it. It also contains our existing
templates in this new format, and removes the old template files.
The format is documented in the docstrings of the tools, but
briefly, it keeps Machines, Products and TestSuites but improves
their format a bit (by turning dicts-of-lists into dicts-of-
dicts), and adds Profiles, which are combinations of Machines and
Products. TestSuites can indicate which Profiles they should be
run on.
The intermediate format converter (`fifconverter`) converts
existing template data (in JSON format; use tojson.pm to convert
our perl templates to JSON) to the intermediate format and
writes it out. As this was really intended only for one-time use
(the idea is that after one-time conversion, we will edit the
templates in the intermediate format from now on), its operation
is hardcoded and relies on specific filenames.
The intermediate format loader (`fifloader`) generates
JobTemplates from the TestSuites and Profiles, reverses the
quality-of-life improvements of the intermediate format, and
produces template data compatible with the upstream loader, then
can write it to disk and/or call the upstream loader directly.
The check script (`fifcheck`) runs existing template data through
both the converter and the loader, then checks that the result is
equivalent to the input. Again this was mostly written for one-
time use so is fairly rough and hard-coded, but I'm including it
in the commit so others can check the work and so on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-01-23 14:20:10 +00:00
|
|
|
"POSTINSTALL": "_live_build",
|
|
|
|
|
"ROOT_PASSWORD": "weakpassword",
|
|
|
|
|
"USER_LOGIN": "false"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"realmd_join_cockpit": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"realmd_join_sssd": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 30,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 30,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_cockpit_basic": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_cockpit_default": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
2020-01-24 15:32:55 +00:00
|
|
|
"server_cockpit_updates": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
Add a whole intermediate template format ('FIF') and tools
I and @lruzicka (and I think @jskladan and @jsedlak and
@michelmno and everyone else who's ever touched it...) are being
gradually driven nuts by manually editing the test templates.
The bigger the files get the more awkward it is to keep them
straight and be sure we're doing it right. Upstream doesn't do
things the same way we do (they mostly edit in the web UI and
dump to file for the record), but we do still think making
changes in the repo and posting to the web UI is the right way
around to do it, we just wish the format was saner.
Upstream has actually recently introduced a YAML-based approach
to storing job templates which tries to condense things a bit,
and you can dump to that format with dump-templates --json, but
@lruzicka and I agree that that format is barely better for
hand editing in a text editor than the older one our templates
currently use.
So, this commit introduces...Fedora Intermediate Format (FIF) -
an alternative format for representing job templates - and some
tools for working with it. It also contains our existing
templates in this new format, and removes the old template files.
The format is documented in the docstrings of the tools, but
briefly, it keeps Machines, Products and TestSuites but improves
their format a bit (by turning dicts-of-lists into dicts-of-
dicts), and adds Profiles, which are combinations of Machines and
Products. TestSuites can indicate which Profiles they should be
run on.
The intermediate format converter (`fifconverter`) converts
existing template data (in JSON format; use tojson.pm to convert
our perl templates to JSON) to the intermediate format and
writes it out. As this was really intended only for one-time use
(the idea is that after one-time conversion, we will edit the
templates in the intermediate format from now on), its operation
is hardcoded and relies on specific filenames.
The intermediate format loader (`fifloader`) generates
JobTemplates from the TestSuites and Profiles, reverses the
quality-of-life improvements of the intermediate format, and
produces template data compatible with the upstream loader, then
can write it to disk and/or call the upstream loader directly.
The check script (`fifcheck`) runs existing template data through
both the converter and the loader, then checks that the result is
equivalent to the input. Again this was mostly written for one-
time use so is fairly rough and hard-coded, but I'm including it
in the commit so others can check the work and so on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-01-23 14:20:10 +00:00
|
|
|
"server_database_client": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_firewall_default": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_freeipa_replication_client": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_freeipa_replication_master": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_freeipa_replication_replica": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
2020-01-24 15:32:55 +00:00
|
|
|
"server_remote_logging_client": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_remote_logging_server": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
Add a whole intermediate template format ('FIF') and tools
I and @lruzicka (and I think @jskladan and @jsedlak and
@michelmno and everyone else who's ever touched it...) are being
gradually driven nuts by manually editing the test templates.
The bigger the files get the more awkward it is to keep them
straight and be sure we're doing it right. Upstream doesn't do
things the same way we do (they mostly edit in the web UI and
dump to file for the record), but we do still think making
changes in the repo and posting to the web UI is the right way
around to do it, we just wish the format was saner.
Upstream has actually recently introduced a YAML-based approach
to storing job templates which tries to condense things a bit,
and you can dump to that format with dump-templates --json, but
@lruzicka and I agree that that format is barely better for
hand editing in a text editor than the older one our templates
currently use.
So, this commit introduces...Fedora Intermediate Format (FIF) -
an alternative format for representing job templates - and some
tools for working with it. It also contains our existing
templates in this new format, and removes the old template files.
The format is documented in the docstrings of the tools, but
briefly, it keeps Machines, Products and TestSuites but improves
their format a bit (by turning dicts-of-lists into dicts-of-
dicts), and adds Profiles, which are combinations of Machines and
Products. TestSuites can indicate which Profiles they should be
run on.
The intermediate format converter (`fifconverter`) converts
existing template data (in JSON format; use tojson.pm to convert
our perl templates to JSON) to the intermediate format and
writes it out. As this was really intended only for one-time use
(the idea is that after one-time conversion, we will edit the
templates in the intermediate format from now on), its operation
is hardcoded and relies on specific filenames.
The intermediate format loader (`fifloader`) generates
JobTemplates from the TestSuites and Profiles, reverses the
quality-of-life improvements of the intermediate format, and
produces template data compatible with the upstream loader, then
can write it to disk and/or call the upstream loader directly.
The check script (`fifcheck`) runs existing template data through
both the converter and the loader, then checks that the result is
equivalent to the input. Again this was mostly written for one-
time use so is fairly rough and hard-coded, but I'm including it
in the commit so others can check the work and so on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-01-23 14:20:10 +00:00
|
|
|
"server_role_deploy_database_server": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"server_role_deploy_domain_controller": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-aarch64-*-aarch64": 40,
|
|
|
|
|
"fedora-updates-server-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"support_server": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-everything-boot-iso-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"upgrade_desktop_encrypted_64bit": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-workstation-upgrade-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"upgrade_realmd_client": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-upgrade-ppc64le-*-ppc64le": 30,
|
|
|
|
|
"fedora-updates-server-upgrade-x86_64-*-64bit": 30
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
"upgrade_server_domain_controller": {
|
|
|
|
|
"profiles": {
|
|
|
|
|
"fedora-updates-server-upgrade-ppc64le-*-ppc64le": 40,
|
|
|
|
|
"fedora-updates-server-upgrade-x86_64-*-64bit": 40
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-01-24 15:29:02 +00:00
|
|
|
}
|