Add support for name and version to bump release

inputs/prod_inner.json

@@ -30,7 +30,6 @@
     },
     {
       "args": {
-        "target": "{{KOJI_TARGET}}",
         "hub": "{{KOJI_HUB}}"
       },
       "name": "bump_release"

osbs/build/build_request.py

@@ -470,15 +470,13 @@ def render_bump_release(self):
         if not self.dj.dock_json_has_plugin_conf(phase, plugin):
             return
 
-        target = self.spec.koji_target.value
         hub = self.spec.kojihub.value
-        if not (target and hub):
-            logger.info('removing %s from request as koji info not specified',
+        if not hub:
+            logger.info('removing %s from request as koji hub not specified',
                         plugin)
             self.dj.remove_plugin(phase, plugin)
             return
 
-        self.dj.dock_json_set_arg(phase, plugin, 'target', target)
         self.dj.dock_json_set_arg(phase, plugin, 'hub', hub)
 
     def render_koji_promote(self, use_auth=None):

tests/build/test_build_request.py

@@ -253,8 +253,6 @@ def test_render_prod_request_with_repo(self, architecture, build_image, build_im
             get_plugin(plugins, "prebuild_plugins",
                        "stop_autorebuild_if_disabled")
 
-        assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
-                                "args", "target") == "koji-target"
         assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
                                 "args", "hub") == "http://hub/"
 
@@ -364,8 +362,6 @@ def test_render_prod_request(self, proxy):
             get_plugin(plugins, "prebuild_plugins",
                        "stop_autorebuild_if_disabled")
 
-        assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
-                                "args", "target") == koji_target
         assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
                                 "args", "hub") == "http://hub/"
 
@@ -540,8 +536,6 @@ def test_render_prod_with_secret_request(self):
             get_plugin(plugins, "prebuild_plugins",
                        "stop_autorebuild_if_disabled")
 
-        assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
-                                "args", "target") == "koji-target"
         assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
                                 "args", "hub") == "http://hub/"
 
@@ -891,8 +885,6 @@ def test_render_with_yum_repourls(self):
             get_plugin(plugins, "prebuild_plugins",
                        "stop_autorebuild_if_disabled")
 
-        assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
-                                "args", "target") == "koji-target"
         assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
                                 "args", "hub") == "http://hub/"
 
@@ -909,12 +901,11 @@ def test_render_with_yum_repourls(self):
         with pytest.raises(NoSuchPluginException):
             get_plugin(plugins, "exit_plugins", "sendmail")
 
-    @pytest.mark.parametrize(('hub', 'target', 'disabled'), [
-        ('http://hub/', 'koji-target', False),
-        (None, 'koji-target', True),
-        ('http://hub/', None, True),
+    @pytest.mark.parametrize(('hub', 'disabled'), [
+        ('http://hub/', False),
+        (None, True),
     ])
-    def test_render_bump_release(self, hub, target, disabled):
+    def test_render_bump_release(self, hub, disabled):
         kwargs = {
             'git_uri': TEST_GIT_URI,
             'git_ref': TEST_GIT_REF,
@@ -934,9 +925,6 @@ def test_render_bump_release(self, hub, target, disabled):
         if hub:
             kwargs['kojihub'] = hub
 
-        if target:
-            kwargs['koji_target'] = target
-
         build_request = BuildRequest(INPUTS_PATH)
         build_request.set_params(**kwargs)
         build_json = build_request.render()
@@ -948,8 +936,6 @@ def test_render_bump_release(self, hub, target, disabled):
                 get_plugin(plugins, "prebuild_plugins", "bump_release")
 
         else:
-            assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
-                                    "args", "target") == target
             assert plugin_value_get(plugins, "prebuild_plugins", "bump_release",
                                     "args", "hub") == hub