srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-08-24 16:15:44 +00:00
Code Issues Releases Activity

Use new ProductDefaults in our templates

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-05-10 13:39:27 -07:00
parent 99638a0c25
commit 42798a52f6
2 changed files with 57 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
templates-updates.fif.json
View File

@ -86,99 +86,73 @@
} }
} }
}, },
"ProductDefaults": {
"distri": "fedora",
"version": "*"
},
"Products": { "Products": {
"fedora-updates-container-aarch64-*": { "fedora-updates-container-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "updates-container"
"flavor": "updates-container",
"version": "*"
}, },
"fedora-updates-container-ppc64le-*": { "fedora-updates-container-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "updates-container"
"flavor": "updates-container",
"version": "*"
}, },
"fedora-updates-container-x86_64-*": { "fedora-updates-container-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora",
"flavor": "updates-container", "flavor": "updates-container",
"settings": { "settings": {
"KIWI_PROFILE": "Container-Base-Generic" "KIWI_PROFILE": "Container-Base-Generic"
}, }
"version": "*"
}, },
"fedora-updates-everything-boot-iso-x86_64-*": { "fedora-updates-everything-boot-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-everything-boot-iso"
"flavor": "updates-everything-boot-iso",
"version": "*"
}, },
"fedora-updates-kde-x86_64-*": { "fedora-updates-kde-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-kde"
"flavor": "updates-kde",
"version": "*"
}, },
"fedora-updates-server-aarch64-*": { "fedora-updates-server-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "updates-server"
"flavor": "updates-server",
"version": "*"
}, },
"fedora-updates-server-ppc64le-*": { "fedora-updates-server-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "updates-server"
"flavor": "updates-server",
"version": "*"
}, },
"fedora-updates-server-upgrade-ppc64le-*": { "fedora-updates-server-upgrade-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "updates-server-upgrade"
"flavor": "updates-server-upgrade",
"version": "*"
}, },
"fedora-updates-server-upgrade-x86_64-*": { "fedora-updates-server-upgrade-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-server-upgrade"
"flavor": "updates-server-upgrade",
"version": "*"
}, },
"fedora-updates-server-x86_64-*": { "fedora-updates-server-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-server"
"flavor": "updates-server",
"version": "*"
}, },
"fedora-updates-silverblue-dvd_ostree-iso-x86_64-*": { "fedora-updates-silverblue-dvd_ostree-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-silverblue-dvd_ostree-iso"
"flavor": "updates-silverblue-dvd_ostree-iso",
"version": "*"
}, },
"fedora-updates-workstation-live-iso-x86_64-*": { "fedora-updates-workstation-live-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-workstation-live-iso"
"flavor": "updates-workstation-live-iso",
"version": "*"
}, },
"fedora-updates-kde-live-iso-x86_64-*": { "fedora-updates-kde-live-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-kde-live-iso"
"flavor": "updates-kde-live-iso",
"version": "*"
}, },
"fedora-updates-workstation-upgrade-x86_64-*": { "fedora-updates-workstation-upgrade-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-workstation-upgrade"
"flavor": "updates-workstation-upgrade",
"version": "*"
}, },
"fedora-updates-workstation-x86_64-*": { "fedora-updates-workstation-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "updates-workstation"
"flavor": "updates-workstation",
"version": "*"
} }
}, },
"Profiles": { "Profiles": {

140
templates.fif.json
View File

@ -228,219 +228,155 @@
} }
} }
}, },
"ProductDefaults": {
"distri": "fedora",
"version": "*"
},
"Products": { "Products": {
"fedora-BaseOS-boot-iso-x86_64-*": { "fedora-BaseOS-boot-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "BaseOS-boot-iso"
"flavor": "BaseOS-boot-iso",
"version": "*"
}, },
"fedora-BaseOS-dvd-iso-x86_64-*": { "fedora-BaseOS-dvd-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "BaseOS-dvd-iso"
"flavor": "BaseOS-dvd-iso",
"version": "*"
}, },
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*": { "fedora-Cloud_Base-qcow2-qcow2-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Cloud_Base-qcow2-qcow2"
"flavor": "Cloud_Base-qcow2-qcow2",
"version": "*"
}, },
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*": { "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "Cloud_Base-qcow2-qcow2"
"flavor": "Cloud_Base-qcow2-qcow2",
"version": "*"
}, },
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*": { "fedora-Cloud_Base-qcow2-qcow2-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "Cloud_Base-qcow2-qcow2"
"flavor": "Cloud_Base-qcow2-qcow2",
"version": "*"
}, },
"fedora-CoreOS-colive-iso-x86_64-*": { "fedora-CoreOS-colive-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "CoreOS-colive-iso"
"flavor": "CoreOS-colive-iso",
"version": "*"
}, },
"fedora-Everything-boot-iso-ppc64le-*": { "fedora-Everything-boot-iso-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "Everything-boot-iso"
"flavor": "Everything-boot-iso",
"version": "*"
}, },
"fedora-Everything-boot-iso-x86_64-*": { "fedora-Everything-boot-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora",
"flavor": "Everything-boot-iso", "flavor": "Everything-boot-iso",
"settings": { "settings": {
"+QEMURAM": 3072 "+QEMURAM": 3072
}, }
"version": "*"
}, },
"fedora-IoT-dvd_ostree-iso-aarch64-*": { "fedora-IoT-dvd_ostree-iso-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "IoT-dvd_ostree-iso"
"flavor": "IoT-dvd_ostree-iso",
"version": "*"
}, },
"fedora-IoT-dvd_ostree-iso-x86_64-*": { "fedora-IoT-dvd_ostree-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "IoT-dvd_ostree-iso"
"flavor": "IoT-dvd_ostree-iso",
"version": "*"
}, },
"fedora-KDE-live-iso-x86_64-*": { "fedora-KDE-live-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "KDE-live-iso"
"flavor": "KDE-live-iso",
"version": "*"
}, },
"fedora-i3-live-x86_64*": { "fedora-i3-live-x86_64*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "i3-live-iso"
"flavor": "i3-live-iso",
"version": "*"
}, },
"fedora-Minimal-raw_xz-raw.xz-aarch64-*": { "fedora-Minimal-raw_xz-raw.xz-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Minimal-raw_xz-raw.xz"
"flavor": "Minimal-raw_xz-raw.xz",
"version": "*"
}, },
"fedora-Server-boot-iso-aarch64-*": { "fedora-Server-boot-iso-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Server-boot-iso"
"flavor": "Server-boot-iso",
"version": "*"
}, },
"fedora-Server-boot-iso-ppc64le-*": { "fedora-Server-boot-iso-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "Server-boot-iso"
"flavor": "Server-boot-iso",
"version": "*"
}, },
"fedora-Server-boot-iso-x86_64-*": { "fedora-Server-boot-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora",
"flavor": "Server-boot-iso", "flavor": "Server-boot-iso",
"settings": { "settings": {
"+QEMURAM": 3072 "+QEMURAM": 3072
}, }
"version": "*"
}, },
"fedora-Server-dvd-iso-aarch64-*": { "fedora-Server-dvd-iso-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Server-dvd-iso"
"flavor": "Server-dvd-iso",
"version": "*"
}, },
"fedora-Server-dvd-iso-ppc64le-*": { "fedora-Server-dvd-iso-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "Server-dvd-iso"
"flavor": "Server-dvd-iso",
"version": "*"
}, },
"fedora-Server-dvd-iso-x86_64-*": { "fedora-Server-dvd-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "Server-dvd-iso"
"flavor": "Server-dvd-iso",
"version": "*"
}, },
"fedora-Server-raw_xz-raw.xz-aarch64-*": { "fedora-Server-raw_xz-raw.xz-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Server-raw_xz-raw.xz"
"flavor": "Server-raw_xz-raw.xz",
"version": "*"
}, },
"fedora-Silverblue-dvd_ostree-iso-ppc64le-*": { "fedora-Silverblue-dvd_ostree-iso-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "Silverblue-dvd_ostree-iso"
"flavor": "Silverblue-dvd_ostree-iso",
"version": "*"
}, },
"fedora-Silverblue-dvd_ostree-iso-x86_64-*": { "fedora-Silverblue-dvd_ostree-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "Silverblue-dvd_ostree-iso"
"flavor": "Silverblue-dvd_ostree-iso",
"version": "*"
}, },
"fedora-Workstation-live-iso-ppc64le-*": { "fedora-Workstation-live-iso-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "Workstation-live-iso"
"flavor": "Workstation-live-iso",
"version": "*"
}, },
"fedora-Workstation-live-iso-x86_64-*": { "fedora-Workstation-live-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora",
"flavor": "Workstation-live-iso", "flavor": "Workstation-live-iso",
"settings": { "settings": {
"INSTALL_RETRY": "5" "INSTALL_RETRY": "5"
}, }
"version": "*"
}, },
"fedora-Workstation-live_osbuild-iso-x86_64-*": { "fedora-Workstation-live_osbuild-iso-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "Workstation-live_osbuild-iso"
"flavor": "Workstation-live_osbuild-iso",
"version": "*"
}, },
"fedora-Workstation-upgrade-x86_64-*": { "fedora-Workstation-upgrade-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "Workstation-upgrade"
"flavor": "Workstation-upgrade",
"version": "*"
}, },
"fedora-Workstation-raw_xz-raw.xz-aarch64-*": { "fedora-Workstation-raw_xz-raw.xz-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Workstation-raw_xz-raw.xz"
"flavor": "Workstation-raw_xz-raw.xz",
"version": "*"
}, },
"fedora-Workstation-upgrade-aarch64-*": { "fedora-Workstation-upgrade-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "Workstation-upgrade"
"flavor": "Workstation-upgrade",
"version": "*"
}, },
"fedora-universal-aarch64-*": { "fedora-universal-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "universal"
"flavor": "universal",
"version": "*"
}, },
"fedora-universal-ppc64le-*": { "fedora-universal-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "universal"
"flavor": "universal",
"version": "*"
}, },
"fedora-universal-x86_64-*": { "fedora-universal-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "universal"
"flavor": "universal",
"version": "*"
}, },
"fedora-seasonal-aarch64-*": { "fedora-seasonal-aarch64-*": {
"arch": "aarch64", "arch": "aarch64",
"distri": "fedora", "flavor": "seasonal"
"flavor": "seasonal",
"version": "*"
}, },
"fedora-seasonal-ppc64le-*": { "fedora-seasonal-ppc64le-*": {
"arch": "ppc64le", "arch": "ppc64le",
"distri": "fedora", "flavor": "seasonal"
"flavor": "seasonal",
"version": "*"
}, },
"fedora-seasonal-x86_64-*": { "fedora-seasonal-x86_64-*": {
"arch": "x86_64", "arch": "x86_64",
"distri": "fedora", "flavor": "seasonal"
"flavor": "seasonal",
"version": "*"
} }
}, },
"Profiles": { "Profiles": {