From e5a8474afc40cb7886314f028c38bd40c8d7d803 Mon Sep 17 00:00:00 2001
From: soksanichenko <soksanichenko@cloudlinux.com>
Date: Tue, 14 Mar 2023 18:45:01 +0200
Subject: [PATCH] hybrid for all vairants

---
 i686/variants_options.json | 22 +++++++++++-----------
 pungi-build.conf.j2        | 27 +++++++++++++--------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/i686/variants_options.json b/i686/variants_options.json
index 901bb41..ba3d05b 100644
--- a/i686/variants_options.json
+++ b/i686/variants_options.json
@@ -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": [
diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2
index e91de76..3c3f827 100644
--- a/pungi-build.conf.j2
+++ b/pungi-build.conf.j2
@@ -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