Merge pull request #7 from tcooper/templates

Per testing meeting today, merging.
This commit is contained in:
StackKorora 2021-08-19 18:15:44 -05:00 committed by GitHub
commit 8d56f19945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions

View File

@ -31,6 +31,13 @@
"DESKTOP": "gnome" "DESKTOP": "gnome"
}, },
"version": "*" "version": "*"
},
"rocky-updates-minimal-x86_64-*": {
"arch": "x86_64",
"distri": "rocky",
"flavor": "updates-minimal",
"settings": {},
"version": "*"
} }
}, },
"Profiles": { "Profiles": {
@ -49,6 +56,10 @@
"rocky-updates-workstation-x86_64-*-64bit": { "rocky-updates-workstation-x86_64-*-64bit": {
"machine": "64bit", "machine": "64bit",
"product": "rocky-updates-workstation-x86_64-*" "product": "rocky-updates-workstation-x86_64-*"
},
"rocky-updates-minimal-x86_64-*-64bit": {
"machine": "64bit",
"product": "rocky-updates-minimal-x86_64-*"
} }
}, },
"TestSuites": { "TestSuites": {
@ -65,36 +76,42 @@
}, },
"base_selinux": { "base_selinux": {
"profiles": { "profiles": {
"rocky-updates-minimal-x86_64-*-64bit": 40,
"rocky-updates-server-x86_64-*-64bit": 40, "rocky-updates-server-x86_64-*-64bit": 40,
"rocky-updates-workstation-x86_64-*-64bit": 40 "rocky-updates-workstation-x86_64-*-64bit": 40
} }
}, },
"base_service_manipulation": { "base_service_manipulation": {
"profiles": { "profiles": {
"rocky-updates-minimal-x86_64-*-64bit": 40,
"rocky-updates-server-x86_64-*-64bit": 40, "rocky-updates-server-x86_64-*-64bit": 40,
"rocky-updates-workstation-x86_64-*-64bit": 40 "rocky-updates-workstation-x86_64-*-64bit": 40
} }
}, },
"base_services_start": { "base_services_start": {
"profiles": { "profiles": {
"rocky-updates-minimal-x86_64-*-64bit": 40,
"rocky-updates-server-x86_64-*-64bit": 40, "rocky-updates-server-x86_64-*-64bit": 40,
"rocky-updates-workstation-x86_64-*-64bit": 40 "rocky-updates-workstation-x86_64-*-64bit": 40
} }
}, },
"base_update_cli": { "base_update_cli": {
"profiles": { "profiles": {
"rocky-updates-minimal-x86_64-*-64bit": 40,
"rocky-updates-server-x86_64-*-64bit": 40, "rocky-updates-server-x86_64-*-64bit": 40,
"rocky-updates-workstation-x86_64-*-64bit": 40 "rocky-updates-workstation-x86_64-*-64bit": 40
} }
}, },
"base_reboot_unmount": { "base_reboot_unmount": {
"profiles": { "profiles": {
"rocky-updates-minimal-x86_64-*-64bit": 40,
"rocky-updates-server-x86_64-*-64bit": 40, "rocky-updates-server-x86_64-*-64bit": 40,
"rocky-updates-workstation-x86_64-*-64bit": 40 "rocky-updates-workstation-x86_64-*-64bit": 40
} }
}, },
"base_system_logging": { "base_system_logging": {
"profiles": { "profiles": {
"rocky-updates-minimal-x86_64-*-64bit": 40,
"rocky-updates-server-x86_64-*-64bit": 40, "rocky-updates-server-x86_64-*-64bit": 40,
"rocky-updates-workstation-x86_64-*-64bit": 40 "rocky-updates-workstation-x86_64-*-64bit": 40
} }

View File

@ -47,6 +47,7 @@
"flavor": "minimal-iso", "flavor": "minimal-iso",
"settings": { "settings": {
"+QEMURAM": 3072, "+QEMURAM": 3072,
"DEPLOY_UPLOAD_TEST": "install_minimal_upload",
"TEST_TARGET": "ISO" "TEST_TARGET": "ISO"
}, },
"version": "*" "version": "*"
@ -375,6 +376,16 @@
"POSTINSTALL": "_collect_data" "POSTINSTALL": "_collect_data"
} }
}, },
"install_minimal_upload": {
"profiles": {
"rocky-minimal-iso-x86_64-*-64bit": 10
},
"settings": {
"PACKAGE_SET": "minimal",
"POSTINSTALL": "_collect_data",
"STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
}
},
"install_default_upload": { "install_default_upload": {
"profiles": { "profiles": {
"rocky-dvd-iso-x86_64-*-64bit": 10 "rocky-dvd-iso-x86_64-*-64bit": 10