From 03293c725b3e037997deac37b73656fe3fbef1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Tue, 7 Nov 2017 14:05:50 +0100
Subject: [PATCH] config: Make pkgset_koji_tag optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are valid use cases for not specifying this option: specifically a
modular compose will get the tags to use from modules listed in the
variants file.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 doc/configuration.rst | 5 +++--
 pungi/checks.py       | 1 -
 tests/test_config.py  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/configuration.rst b/doc/configuration.rst
index 7f455ce8..a1408317 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -446,8 +446,9 @@ Options
 **pkgset_source** [mandatory]
     (*str*) -- "koji" (any koji instance) or "repos" (arbitrary yum repositories)
 
-**pkgset_koji_tag** [mandatory]
-    (*str|[str]*) -- tag(s) to read package set from
+**pkgset_koji_tag**
+    (*str|[str]*) -- tag(s) to read package set from. This option can be
+    omitted for modular composes.
 
 **pkgset_koji_inherit** = True
     (*bool*) -- inherit builds from parent tags; we can turn it off only if we
diff --git a/pungi/checks.py b/pungi/checks.py
index 9db1c92c..473a470a 100644
--- a/pungi/checks.py
+++ b/pungi/checks.py
@@ -1172,7 +1172,6 @@ CONFIG_DEPS = {
     },
     "pkgset_source": {
         "requires": [
-            (lambda x: x == "koji", ["pkgset_koji_tag"]),
             (lambda x: x == "repos", ["pkgset_repos"]),
         ],
         "conflicts": [
diff --git a/tests/test_config.py b/tests/test_config.py
index 5a75cff1..5cfdcbb0 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -30,7 +30,6 @@ class PkgsetConfigTestCase(ConfigTestCase):
     def test_validate_minimal_pkgset_koji(self):
         cfg = load_config(
             pkgset_source='koji',
-            pkgset_koji_tag="f25",
         )
 
         self.assertValidation(cfg)
@@ -64,8 +63,7 @@ class PkgsetConfigTestCase(ConfigTestCase):
 
         self.assertValidation(
             cfg,
-            [checks.REQUIRES.format('pkgset_source', 'koji', 'pkgset_koji_tag'),
-             checks.CONFLICTS.format('pkgset_source', 'koji', 'pkgset_repos')])
+            [checks.CONFLICTS.format('pkgset_source', 'koji', 'pkgset_repos')])
 
     def test_pkgset_multiple_koji_tags(self):
         cfg = load_config(