From e62ef7951c0b1dacd0ecb147d538225e4ded1ab5 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Apr 30 2018 11:57:12 +0000
Subject: Fix wrong expectation of container.yaml format.


---

diff --git a/freshmaker/handlers/errata/errata_advisory_rpms_signed.py b/freshmaker/handlers/errata/errata_advisory_rpms_signed.py
index 03939b9..028729c 100644
--- a/freshmaker/handlers/errata/errata_advisory_rpms_signed.py
+++ b/freshmaker/handlers/errata/errata_advisory_rpms_signed.py
@@ -181,17 +181,25 @@ class ErrataAdvisoryRPMsSignedHandler(ContainerBuildHandler):
 
             content_sets_path = os.path.join(repodir, "content_sets.yml")
             if not os.path.exists(content_sets_path):
+                self.log_debug("Should generate Pulp repo, %s does not exist.",
+                               content_sets_path)
                 return True
 
             container_path = os.path.join(repodir, "container.yaml")
             if not os.path.exists(container_path):
+                self.log_debug("Should generate Pulp repo, %s does not exist.",
+                               container_path)
                 return True
 
             with open(container_path, 'r') as f:
                 container_yaml = yaml.load(f)
 
-            if ("pulp_repos" not in container_yaml or
-                    not container_yaml["pulp_repos"]):
+            if ("compose" not in container_yaml or
+                    "pulp_repos" not in container_yaml["compose"] or
+                    not container_yaml["compose"]["pulp_repos"]):
+                self.log_debug(
+                    "Should generate Pulp repo, pulp_repos not enabled in %s.",
+                    container_path)
                 return True
 
             return False
diff --git a/tests/test_errata_advisory_rpms_signed_handler.py b/tests/test_errata_advisory_rpms_signed_handler.py
index d6d7790..4c255c9 100644
--- a/tests/test_errata_advisory_rpms_signed_handler.py
+++ b/tests/test_errata_advisory_rpms_signed_handler.py
@@ -673,7 +673,7 @@ class TestShouldGenerateYumRepourls(helpers.FreshmakerTestCase):
     def test_generate(self):
         self.path_exists.return_value = True
         self.patched_open.return_value = mock_open(
-            read_data="pulp_repos: True").return_value
+            read_data="compose:\n  pulp_repos: True").return_value
 
         ret = self.handler._should_generate_yum_repourls(
             "rpms/foo-docker", "branch", "commit")
@@ -687,7 +687,7 @@ class TestShouldGenerateYumRepourls(helpers.FreshmakerTestCase):
     def test_generate_no_namespace(self):
         self.path_exists.return_value = True
         self.patched_open.return_value = mock_open(
-            read_data="pulp_repos: True").return_value
+            read_data="compose:\n  pulp_repos: True").return_value
 
         ret = self.handler._should_generate_yum_repourls(
             "foo-docker", "branch", "commit")
@@ -701,7 +701,7 @@ class TestShouldGenerateYumRepourls(helpers.FreshmakerTestCase):
     def test_generate_no_pulp_repos(self):
         self.path_exists.return_value = True
         self.patched_open.return_value = mock_open(
-            read_data="pulp_repos_x: True").return_value
+            read_data="compose:\n  pulp_repos_x: True").return_value
 
         ret = self.handler._should_generate_yum_repourls(
             "rpms/foo-docker", "branch", "commit")
@@ -710,7 +710,7 @@ class TestShouldGenerateYumRepourls(helpers.FreshmakerTestCase):
     def test_generate_pulp_repos_false(self):
         self.path_exists.return_value = True
         self.patched_open.return_value = mock_open(
-            read_data="pulp_repos: False").return_value
+            read_data="compose:\n  pulp_repos: False").return_value
 
         ret = self.handler._should_generate_yum_repourls(
             "rpms/foo-docker", "branch", "commit")