hybrid for all vairants

This commit is contained in:
soksanichenko 2023-03-14 18:45:01 +02:00
parent fb4e2c52ea
commit e5a8474afc
2 changed files with 24 additions and 25 deletions

View File

@ -1,11 +1,11 @@
{
"BaseOS": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"AppStream": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
@ -13,7 +13,7 @@
]
},
"PowerTools": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
@ -22,7 +22,7 @@
]
},
"HighAvailability": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
@ -31,7 +31,7 @@
]
},
"ResilientStorage": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [
@ -40,32 +40,32 @@
]
},
"Minimal": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"NFV": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"RT": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"SAP": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"SAPHANA": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true
},
"extras": {
"gather_methods": {"*": "nodeps"},
"gather_methods": "hybrid",
"buildinstall_skip": true,
"createiso_skip": true,
"variant_as_lookaside": [

View File

@ -73,20 +73,19 @@ gather_prepopulate = {
"file": "{{ arch }}/packages.json",
}
gather_method = "nodeps"
#gather_method = {
# {% for variant, options in variants.items() %}
# {% if options['gather_methods'] is string %}
# "^{{ variant }}$": "{{ options['gather_methods'] }}",
# {% else %}
# "^{{ variant }}$": {
# {% for source_name, gather_method in options['gather_methods'].items() %}
# "{{ source_name }}": "{{ gather_method }}",
# {% endfor %}
# },
# {% endif %}
# {% endfor %}
#}
gather_method = {
{% for variant, options in variants.items() %}
{% if options['gather_methods'] is string %}
"^{{ variant }}$": "{{ options['gather_methods'] }}",
{% else %}
"^{{ variant }}$": {
{% for source_name, gather_method in options['gather_methods'].items() %}
"{{ source_name }}": "{{ gather_method }}",
{% endfor %}
},
{% endif %}
{% endfor %}
}
gather_backend = "dnf"
check_deps = True