Set all build params for prod builds

Previously, source_secret was mistakenly left out.
containerbuildsystem · Aug 10, 2015 · 290ebc3 · 290ebc3
1 parent d97f524
commit 290ebc3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 55 deletions.
diff --git a/osbs/api.py b/osbs/api.py
@@ -173,38 +173,6 @@ def create_prod_build(self, git_uri, git_ref, git_branch, user, component, targe
                           architecture, yum_repourls=None, namespace=DEFAULT_NAMESPACE, **kwargs):
         base_image = utils.get_base_image(git_uri, git_ref)
         build_request = self.get_build_request(PROD_BUILD_TYPE)
-        build_request.set_params(
-            git_uri=git_uri,
-            git_ref=git_ref,
-            git_branch=git_branch,
-            user=user,
-            component=component,
-            base_image=base_image,
-            registry_uri=self.build_conf.get_registry_uri(),
-            openshift_uri=self.os_conf.get_openshift_base_uri(),
-            kojiroot=self.build_conf.get_kojiroot(),
-            kojihub=self.build_conf.get_kojihub(),
-            sources_command=self.build_conf.get_sources_command(),
-            koji_target=target,
-            architecture=architecture,
-            vendor=self.build_conf.get_vendor(),
-            build_host=self.build_conf.get_build_host(),
-            authoritative_registry=self.build_conf.get_authoritative_registry(),
-            use_auth=self.build_conf.get_use_auth(),
-            yum_repourls=yum_repourls
-        )
-        build_json = build_request.render()
-        response = self._create_build_config_and_build(build_json, namespace)
-        build_response = BuildResponse(response)
-        logger.debug(build_response.json)
-        return build_response
-
-    @osbsapi
-    def create_prod_with_secret_build(self, git_uri, git_ref, git_branch, user, component,
-                                      target, architecture, yum_repourls=None,
-                                      namespace=DEFAULT_NAMESPACE, **kwargs):
-        base_image = utils.get_base_image(git_uri, git_ref)
-        build_request = self.get_build_request(PROD_WITH_SECRET_BUILD_TYPE)
         build_request.set_params(
             git_uri=git_uri,
             git_ref=git_ref,
@@ -235,33 +203,21 @@ def create_prod_with_secret_build(self, git_uri, git_ref, git_branch, user, comp
         logger.debug(build_response.json)
         return build_response
 
+    @osbsapi
+    def create_prod_with_secret_build(self, git_uri, git_ref, git_branch, user, component,
+                                      target, architecture, yum_repourls=None,
+                                      namespace=DEFAULT_NAMESPACE, **kwargs):
+        return self.create_prod_build(git_uri, git_ref, git_branch, user, component, target,
+                                      architecture, yum_repourls=yum_repourls,
+                                      namespace=namespace, **kwargs)
+
     @osbsapi
     def create_prod_without_koji_build(self, git_uri, git_ref, git_branch, user, component,
                                        architecture, yum_repourls=None,
                                        namespace=DEFAULT_NAMESPACE, **kwargs):
-        base_image = utils.get_base_image(git_uri, git_ref)
-        build_request = self.get_build_request(PROD_BUILD_TYPE)
-        build_request.set_params(
-            git_uri=git_uri,
-            git_ref=git_ref,
-            git_branch=git_branch,
-            user=user,
-            component=component,
-            base_image=base_image,
-            registry_uri=self.build_conf.get_registry_uri(),
-            openshift_uri=self.os_conf.get_openshift_base_uri(),
-            sources_command=self.build_conf.get_sources_command(),
-            architecture=architecture,
-            vendor=self.build_conf.get_vendor(),
-            build_host=self.build_conf.get_build_host(),
-            authoritative_registry=self.build_conf.get_authoritative_registry(),
-            yum_repourls=yum_repourls,
-            use_auth=self.build_conf.get_use_auth(),
-        )
-        build_json = build_request.render()
-        response = self._create_build_config_and_build(build_json, namespace)
-        build_response = BuildResponse(response)
-        return build_response
+        return self.create_prod_build(git_uri, git_ref, git_branch, user, component, None,
+                                      architecture, yum_repourls=yum_repourls,
+                                      namespace=namespace, **kwargs)
 
     @osbsapi
     def create_simple_build(self, git_uri, git_ref, git_branch, user, component, yum_repourls=None,

diff --git a/tests/unit_test.py b/tests/unit_test.py
@@ -703,6 +703,27 @@ def test_create_prod_build(osbs):
     assert isinstance(response, BuildResponse)
 
 
+def test_create_prod_with_secret_build(osbs):
+    # TODO: test situation when a buildconfig already exists
+    flexmock(utils).should_receive('get_base_image').\
+        with_args(TEST_GIT_URI, TEST_GIT_REF).and_return('fedora23/python')
+    response = osbs.create_prod_with_secret_build(TEST_GIT_URI, TEST_GIT_REF,
+                                                  TEST_GIT_REF, TEST_USER,
+                                                  TEST_COMPONENT, TEST_TARGET,
+                                                  TEST_ARCH)
+    assert isinstance(response, BuildResponse)
+
+
+def test_create_prod_without_koji_build(osbs):
+    # TODO: test situation when a buildconfig already exists
+    flexmock(utils).should_receive('get_base_image').\
+        with_args(TEST_GIT_URI, TEST_GIT_REF).and_return('fedora23/python')
+    response = osbs.create_prod_without_koji_build(TEST_GIT_URI, TEST_GIT_REF,
+                                                   TEST_GIT_REF, TEST_USER,
+                                                   TEST_COMPONENT, TEST_ARCH)
+    assert isinstance(response, BuildResponse)
+
+
 def test_wait_for_build_to_finish(osbs):
     build_response = osbs.wait_for_build_to_finish(TEST_BUILD)
     assert isinstance(build_response, BuildResponse)