#300 Add missing 'compose_ids' to build_container() call
Merged 9 months ago by jkaluza. Opened 9 months ago by jkaluza.
jkaluza/freshmaker compose-ids-fix  into  master

@@ -420,7 +420,8 @@ 

                                             release=release,

                                             koji_parent_build=koji_parent_build,

                                             arch_override=arch_override,

-                                            scratch=conf.koji_container_scratch_build)

+                                            scratch=conf.koji_container_scratch_build,

+                                            compose_ids=compose_ids)

  

      @fail_artifact_build_on_handler_exception

      def build_image_artifact_build(self, build, repo_urls=[]):

@@ -1057,6 +1057,7 @@ 

                  "error": None,

                  "arches": "x86_64",

                  "generate_pulp_repos": True,

+                 "odcs_compose_ids": None,

              })],

              [ContainerImage({

                  "brew": {

@@ -1099,6 +1100,7 @@ 

                  "error": None,

                  "arches": "x86_64",

                  "generate_pulp_repos": True,

+                 "odcs_compose_ids": None,

              })]

          ]

  

There is ContainerBuildHandler.build_container(...) method which calls KojiService.build_container(...) method. We added compose_ids kwarg to the first one, but forgot to pass it down to the second one.

The test part of this PR is just fixing test broken in some previous commits...

Pull-Request has been merged by jkaluza

9 months ago