diff --git a/docs/configuration_file.md b/docs/configuration_file.md

index 3ea34af..df300ba 100644

--- a/docs/configuration_file.md

+++ b/docs/configuration_file.md

@@ -53,6 +53,12 @@ Some options are also mandatory.

 * `koji_certs_secret` (*optional*, `string`) — name of [kubernetes secret](https://github.com/kubernetes/kubernetes/blob/master/docs/design/secrets.md) to use for koji authentication

+* `koji_use_kerberos` (*optional*, `boolean`) — will set [atomic-reactor](https://github.com/projectatomic/atomic-reactor) plugins to use kerberos to authenticate to koji.

+

+* `koji_kerberos_keytab` (*optional*, `string`) - location of the keytab that will be used to initialize kerberos credentials for [atomic-reactor](https://github.com/projectatomic/atomic-reactor) plugins - usually in the form `FILE:<absolute_path>`, see [kerberos documentation](http://web.mit.edu/Kerberos/krb5-latest/doc/basic/keytab_def.html) for other possible values

+

+* `koji_kerberos_principal` (*optional*, `string`) - kerberos principal for the keytab provided in `koji_kerberos_keytab`

+

 * `sources_command` (*optional*, `string`) — command to use to get dist-git artifacts from lookaside cache (e.g. `fedpkg sources`)

 * `username`, `password` (*optional*, `string`) — when OpenShift is hidden behind authentication proxy, you can specify username and password for basic authentication

@@ -110,3 +116,53 @@ Some options are also mandatory.

 * `memory_limit` (*optional*, `string`) — memory limit to apply to build (for more info, see [documentation for resources](https://github.com/projectatomic/osbs-client/blob/master/docs/resource.md)

 * `storage_limit` (*optional*, `string`) — storage limit to apply to build (for more info, see [documentation for resources](https://github.com/projectatomic/osbs-client/blob/master/docs/resource.md)

+

+

+## Build JSON Templates

+

+In the `build_json_dir` there must be `prod.json` and `prod_inner.json` which

+defines the [OpenShift Build](https://docs.openshift.org/latest/dev_guide/builds.html)

+specification that will be used to enable the specific

+[atomic-reactor](https://github.com/projectatomic/atomic-reactor) plugins that

+should be enabled and the config values for each.

+

+There is also a third file that is optional that can exist along side the

+previous two in `build_json_dir` which is `prod_customize.json` and it will

+provide the ability to set site-specific customizations such as removing,

+plugins, adding plugins, or overriding arguments passed to existing plugins.

+

+The syntax of `prod_customize.json` is as follows:

+

+```json

+{

+    "disable_plugins": [

+        {

+            "plugin_type": "foo_type",

+            "plugin_name": "foo_name"

+        },

+        {

+            "plugin_type": "bar_type",

+            "plugin_name": "bar_name"

+        }

+    ],

+

+    "enable_plugins": [

+        {

+            "plugin_type": "foo_type",

+            "plugin_name": "foo_name",

+            "plugin_args": {

+                "foo_arg1": "foo_value1",

+                "foo_arg2": "foo_value2"

+            }

+        }

+    ]

+}

+```

+

+Such that:

+

+* `disable_plugins` will define a list of dicts that define the plugin type of the plugin that is to be removed (`prebuild_plugins`, `prepublish_plugins`, `postbuild_plugins`, `exit_plugins`) and the name of the plugin.

+

+* `enable_plugins` will define a list of dicts that is used to add plugins or modify already enabled plugins by overriding args passed to the plugin, these must be defined as key-value pairs as illustrated above. It should be noted that plugins added here will be executed at the end of the list of plugins in that particular `plugin_type` (`prebuild_plugins`, `prepublish_plugins`, `postbuild_plugins`, `exit_plugins`), unless the plugin has already been previously added and this setting is only being used to override args. In the case of arg override, the plugin order execution will not change.

+

+

diff --git a/inputs/prod_customize.json b/inputs/prod_customize.json

new file mode 100644

index 0000000..e874211

--- /dev/null

+++ b/inputs/prod_customize.json

@@ -0,0 +1,7 @@

+{

+    "disable_plugins": [

+    ],

+

+    "enable_plugins": [

+    ]

+}

diff --git a/inputs/prod_inner.json b/inputs/prod_inner.json

index 306ac89..d2b5b4e 100644

--- a/inputs/prod_inner.json

+++ b/inputs/prod_inner.json

@@ -154,7 +154,9 @@

         "kojihub": "{{KOJI_HUB}}",

         "url": "{{OPENSHIFT_URI}}",

         "verify_ssl": false,

-        "blocksize": 10485760

+        "blocksize": 10485760,

+        "koji_keytab": false,

+        "koji_principal": false

       }

     },

     {

diff --git a/osbs-client.spec b/osbs-client.spec

index 46423e3..c53b99b 100644

--- a/osbs-client.spec

+++ b/osbs-client.spec

@@ -22,7 +22,7 @@

 %global with_check 1

 %endif

-%global commit 5021224746eb0e6ac12c54c397397b629167030b

+%global commit 696505ae4da4898a4e3689ef18e1f6791b04ea09

 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 # set to 0 to create a normal release

 %global postrelease 0

diff --git a/osbs/api.py b/osbs/api.py

index 1a8e5c5..b2c45d2 100644

--- a/osbs/api.py

+++ b/osbs/api.py

@@ -338,8 +338,9 @@ class OSBS(object):

     @osbsapi

     def create_prod_build(self, git_uri, git_ref,

                           git_branch,  # may be None

-                          user, component,

-                          target,      # may be None

+                          user,

+                          component=None,

+                          target=None,

                           architecture=None, yum_repourls=None,

                           koji_task_id=None,

                           scratch=None,

@@ -351,25 +352,35 @@ class OSBS(object):

         :param git_ref: str, reference to commit

         :param git_branch: str, branch name (may be None)

         :param user: str, user name

-        :param component: str, component name

-        :param target: str, koji target (may be None)

+        :param component: str, not used anymore

+        :param target: str, koji target

         :param architecture: str, build architecture

         :param yum_repourls: list, URLs for yum repos

         :param koji_task_id: int, koji task ID requesting build

         :param scratch: bool, this is a scratch build

         :return: BuildResponse instance

         """

+

+        def get_required_label(labels, names):

+            """

+            get value of label list, first found is returned

+            names has to be non empty tuple

+            """

+            assert names  # always called with a non-empty literal tuple so names[0] is safe

+            for label_name in names:

+                if label_name in labels:

+                    return labels[label_name]

+

+            raise OsbsValidationException("required label '{name}' missing "

+                                          "from Dockerfile"

+                                          .format(name=names[0]))

+

         df_parser = utils.get_df_parser(git_uri, git_ref, git_branch=git_branch)

         build_request = self.get_build_request()

         labels = df_parser.labels

-        for name_label_name in ['name', 'Name']:

-            if name_label_name in labels:

-                name_label = labels[name_label_name]

-                break

-        else:

-            raise OsbsValidationException("required label '{name}' missing "

-                                          "from Dockerfile"

-                                          .format(name=name_label_name))

+

+        name_label = get_required_label(labels, ('name', 'Name'))

+        component = get_required_label(labels, ('com.redhat.component', 'BZComponent'))

         build_request.set_params(

             git_uri=git_uri,

@@ -393,6 +404,9 @@ class OSBS(object):

             koji_target=target,

             koji_certs_secret=self.build_conf.get_koji_certs_secret(),

             koji_task_id=koji_task_id,

+            koji_use_kerberos=self.build_conf.get_koji_use_kerberos(),

+            koji_kerberos_keytab=self.build_conf.get_koji_kerberos_keytab(),

+            koji_kerberos_principal=self.build_conf.get_koji_kerberos_principal(),

             architecture=architecture,

             vendor=self.build_conf.get_vendor(),

             build_host=self.build_conf.get_build_host(),

@@ -408,8 +422,6 @@ class OSBS(object):

             pulp_registry=self.os_conf.get_pulp_registry(),

             nfs_server_path=self.os_conf.get_nfs_server_path(),

             nfs_dest_dir=self.build_conf.get_nfs_destination_dir(),

-            git_push_url=self.build_conf.get_git_push_url(),

-            git_push_username=self.build_conf.get_git_push_username(),

             builder_build_json_dir=self.build_conf.get_builder_build_json_store(),

             scratch=self.build_conf.get_scratch(scratch),

             unique_tag_only=self.build_conf.get_unique_tag_only(),

@@ -423,14 +435,16 @@ class OSBS(object):

         return response

     @osbsapi

-    def create_prod_with_secret_build(self, git_uri, git_ref, git_branch, user, component,

-                                      target, architecture=None, yum_repourls=None, **kwargs):

+    def create_prod_with_secret_build(self, git_uri, git_ref, git_branch, user, component=None,

+                                      target=None, architecture=None, yum_repourls=None, **kwargs):

+        warnings.warn("create_prod_with_secret_build is deprecated, please use create_build")

         return self.create_prod_build(git_uri, git_ref, git_branch, user, component, target,

                                       architecture, yum_repourls=yum_repourls, **kwargs)

     @osbsapi

-    def create_prod_without_koji_build(self, git_uri, git_ref, git_branch, user, component,

+    def create_prod_without_koji_build(self, git_uri, git_ref, git_branch, user, component=None,

                                        architecture=None, yum_repourls=None, **kwargs):

+        warnings.warn("create_prod_without_koji_build is deprecated, please use create_build")

         return self.create_prod_build(git_uri, git_ref, git_branch, user, component, None,

                                       architecture, yum_repourls=yum_repourls, **kwargs)

@@ -448,7 +462,6 @@ class OSBS(object):

         :return: instance of BuildRequest

         """

         kwargs.setdefault('git_branch', None)

-        kwargs.setdefault('target', None)

         return self.create_prod_build(**kwargs)

     @osbsapi

diff --git a/osbs/build/build_request.py b/osbs/build/build_request.py

index 2dda77d..f8ef056 100644

--- a/osbs/build/build_request.py

+++ b/osbs/build/build_request.py

@@ -24,7 +24,7 @@ except ImportError:

 from osbs.build.manipulate import DockJsonManipulator

 from osbs.build.spec import BuildSpec

-from osbs.constants import SECRETS_PATH, DEFAULT_OUTER_TEMPLATE, DEFAULT_INNER_TEMPLATE

+from osbs.constants import SECRETS_PATH, DEFAULT_OUTER_TEMPLATE, DEFAULT_INNER_TEMPLATE, DEFAULT_CUSTOMIZE_CONF

 from osbs.exceptions import OsbsException, OsbsValidationException

 from osbs.utils import looks_like_git_hash, git_repo_humanish_part_from_uri

@@ -46,6 +46,7 @@ class BuildRequest(object):

         self.build_json = None       # rendered template

         self._template = None        # template loaded from filesystem

         self._inner_template = None  # dock json

+        self._customize_conf = None  # site customize conf for _inner_template

         self._dj = None

         self._resource_limits = None

         self._openshift_required_version = parse_version('1.0.6')

@@ -77,7 +78,6 @@ class BuildRequest(object):

         :param distribution_scope: str, distribution scope for this image

                                    (private, authoritative-source-only, restricted, public)

         :param use_auth: bool, use auth from atomic-reactor?

-        :param git_push_url: str, URL for git push

         """

         # Here we cater to the koji "scratch" build type, this will disable

@@ -136,6 +136,20 @@ class BuildRequest(object):

         return self._inner_template

     @property

+    def customize_conf(self):

+        if self._customize_conf is None:

+            path = os.path.join(self.build_json_store, DEFAULT_CUSTOMIZE_CONF)

+            logger.debug("loading customize conf from path %s", path)

+            try:

+                with open(path, "r") as fp:

+                    self._customize_conf= json.load(fp)

+            except IOError:

+                # File not found, which is perfectly fine. Set to empty string

+                self._customize_conf = {}

+

+        return self._customize_conf

+

+    @property

     def dj(self):

         if self._dj is None:

             self._dj = DockJsonManipulator(self.template, self.inner_template)

@@ -367,7 +381,8 @@ class BuildRequest(object):

             # Note: only one for now, but left in a list like other adjust_for_

             # functions in the event that this needs to be expanded

             for when, which in [

-                ("exit_plugins", "koji_promote"),

+                    ("postbuild_plugins", "compress"),

+                    ("exit_plugins", "koji_promote"),

             ]:

                 logger.info("removing %s from request because there are no triggers",

                             which)

@@ -485,7 +500,15 @@ class BuildRequest(object):

             if use_auth is not None:

                 self.dj.dock_json_set_arg('exit_plugins', 'koji_promote',

-                                          'use_auth', use_auth)

+                                            'use_auth', use_auth)

+

+            if (self.spec.koji_use_kerberos.value and

+                    self.spec.koji_kerberos_principal.value and

+                    self.spec.koji_kerberos_keytab.value):

+                self.dj.dock_json_set_arg('exit_plugins', 'koji_promote',

+                    'koji_principal', self.spec.koji_kerberos_principal.value)

+                self.dj.dock_json_set_arg('exit_plugins', 'koji_promote',

+                    'koji_keytab', self.spec.koji_kerberos_keytab.value)

         else:

             logger.info("removing koji_promote from request as no kojihub "

                         "specified")

@@ -648,10 +671,60 @@ class BuildRequest(object):

                 self.dj.dock_json_set_arg('postbuild_plugins', 'import_image',

                                           'insecure_registry', True)

+    def render_customizations(self):

+        """

+        Customize prod_inner for site specific customizations

+        """

+

+        disable_plugins = self.customize_conf.get('disable_plugins', [])

+        if not disable_plugins:

+            logger.debug("No site-specific plugins to disable")

+        else:

+            for plugin_dict in disable_plugins:

+                try:

+                    self.dj.remove_plugin(

+                        plugin_dict['plugin_type'],

+                        plugin_dict['plugin_name']

+                    )

+                    logger.debug(

+                        "site-specific plugin disabled -> Type:{0} Name:{1}".format(

+                            plugin_dict['plugin_type'],

+                            plugin_dict['plugin_name']

+                        )

+                    )

+                except KeyError:

+                    # Malformed config

+                    logger.debug("Invalid custom configuration found for disable_plugins")

+

+        enable_plugins = self.customize_conf.get('enable_plugins', [])

+        if not enable_plugins:

+            logger.debug("No site-specific plugins to enable")

+        else:

+            for plugin_dict in enable_plugins:

+                try:

+                    self.dj.add_plugin(

+                        plugin_dict['plugin_type'],

+                        plugin_dict['plugin_name'],

+                        plugin_dict['plugin_args']

+                    )

+                    logger.debug(

+                        "site-specific plugin enabled -> Type:{0} Name:{1} Args: {2}".format(

+                            plugin_dict['plugin_type'],

+                            plugin_dict['plugin_name'],

+                            plugin_dict['plugin_args']

+                        )

+                    )

+                except KeyError:

+                    # Malformed config

+                    logger.debug("Invalid custom configuration found for enable_plugins")

+

+

     def render(self, validate=True):

         if validate:

             self.spec.validate()

+        self.render_customizations()

+

         # !IMPORTANT! can't be too long: https://github.com/openshift/origin/issues/733

         self.template['metadata']['name'] = self.spec.name.value

         self.render_resource_limits()

@@ -715,16 +788,8 @@ class BuildRequest(object):

         self.dj.dock_json_set_arg('prebuild_plugins', "pull_base_image", "parent_registry",

                                   source_registry.docker_uri if source_registry else None)

-        # The rebuild trigger requires git_branch and git_push_url

-        # parameters, but those parameters are optional. If either was

-        # not provided, remove the trigger.

+        # Set to true to disable triggers in BuildConfig

         remove_triggers = False

-        for param_name in ['git_branch', 'git_push_url']:

-            param = getattr(self.spec, param_name)

-            if not param.value:

-                logger.info("removing triggers as no %s specified", param_name)

-                remove_triggers = True

-                # Continue the loop so we log everything that's missing

         if self.is_custom_base_image():

             logger.info('removing triggers for custom base image build')

diff --git a/osbs/build/build_response.py b/osbs/build/build_response.py

index 2e28ee5..8461805 100644

--- a/osbs/build/build_response.py

+++ b/osbs/build/build_response.py

@@ -27,6 +27,7 @@ class BuildResponse(object):

         """

         self.json = build_json

         self._status = None

+        self._cancelled = None

     @property

     def status(self):

@@ -39,6 +40,18 @@ class BuildResponse(object):

         cap_value = value.capitalize()

         logger.info("changing status from %s to %s", self.status, cap_value)

         self.json['status']['phase'] = cap_value

+        self._status = value

+

+    @property

+    def cancelled(self):

+        if self._cancelled is None:

+            self._cancelled = self.json['status'].get('cancelled')

+        return self._cancelled

+

+    @cancelled.setter

+    def cancelled(self, value):

+        self.json['status']['cancelled'] = value

+        self._cancelled = value

     def is_finished(self):

         return self.status in BUILD_FINISHED_STATES

diff --git a/osbs/build/manipulate.py b/osbs/build/manipulate.py

index a6b64cf..a0fd1b8 100644

--- a/osbs/build/manipulate.py

+++ b/osbs/build/manipulate.py

@@ -50,6 +50,21 @@ class DockJsonManipulator(object):

                 self.dock_json[plugin_type].remove(p)

                 break

+    def add_plugin(self, plugin_type, plugin_name, args_dict):

+        """

+        if config has plugin, override it, else add it

+        """

+

+        plugin_modified = False

+

+        for plugin in self.dock_json[plugin_type]:

+            if plugin['name'] == plugin_name:

+                plugin['args'] = args_dict

+                plugin_modified = True

+

+        if not plugin_modified:

+            self.dock_json[plugin_type].append({"name": plugin_name, "args": args_dict})

+

     def dock_json_has_plugin_conf(self, plugin_type, plugin_name):

         """

         Check whether a plugin is configured.

diff --git a/osbs/build/spec.py b/osbs/build/spec.py

index 1f68281..40d516c 100644

--- a/osbs/build/spec.py

+++ b/osbs/build/spec.py

@@ -147,6 +147,9 @@ class BuildSpec(object):

     kojihub = BuildParam("kojihub", allow_none=True)

     koji_certs_secret = BuildParam("koji_certs_secret", allow_none=True)

     koji_task_id = BuildParam("koji_task_id", allow_none=True)

+    koji_use_kerberos = BuildParam("koji_use_kerberos", allow_none=True)

+    koji_kerberos_principal = BuildParam("koji_kerberos_principal", allow_none=True)

+    koji_kerberos_keytab = BuildParam("koji_kerberos_keytab", allow_none=True)

     image_tag = BuildParam("image_tag")

     pulp_secret = BuildParam("pulp_secret", allow_none=True)

     pulp_registry = BuildParam("pulp_registry", allow_none=True)

@@ -155,8 +158,6 @@ class BuildSpec(object):

     smtp_uri = BuildParam("smtp_uri", allow_none=True)

     nfs_server_path = BuildParam("nfs_server_path", allow_none=True)

     nfs_dest_dir = BuildParam("nfs_dest_dir", allow_none=True)

-    git_push_url = BuildParam("git_push_url", allow_none=True)

-    git_push_username = BuildParam("git_push_username", allow_none=True)

     builder_build_json_dir = BuildParam("builder_build_json_dir", allow_none=True)

     unique_tag_only = BuildParam("unique_tag_only", allow_none=True)

@@ -165,7 +166,6 @@ class BuildSpec(object):

             self.git_uri,

             self.git_ref,

             self.user,

-            self.component,

             self.registry_uris,

             self.openshift_uri,

             self.sources_command,

@@ -183,8 +183,6 @@ class BuildSpec(object):

             self.pdc_url,

             self.smtp_uri,

             self.nfs_server_path,

-            self.git_push_url,

-            self.git_push_username,

         ]

     def set_params(self, git_uri=None, git_ref=None,

@@ -197,12 +195,13 @@ class BuildSpec(object):

                    sources_command=None, architecture=None, vendor=None,

                    build_host=None, authoritative_registry=None, distribution_scope=None,

                    koji_target=None, kojiroot=None, kojihub=None, koji_certs_secret=None,

-                   koji_task_id=None,

+                   koji_use_kerberos=None, koji_kerberos_keytab=None,

+                   koji_kerberos_principal=None, koji_task_id=None,

                    source_secret=None,  # compatibility name for pulp_secret

                    pulp_secret=None, pulp_registry=None, pdc_secret=None, pdc_url=None,

                    smtp_uri=None, nfs_server_path=None,

                    nfs_dest_dir=None, git_branch=None, base_image=None,

-                   name_label=None, git_push_url=None, git_push_username=None,

+                   name_label=None,

                    builder_build_json_dir=None, registry_api_versions=None,

                    unique_tag_only=None,

                    **kwargs):

@@ -240,6 +239,9 @@ class BuildSpec(object):

         self.kojiroot.value = kojiroot

         self.kojihub.value = kojihub

         self.koji_certs_secret.value = koji_certs_secret

+        self.koji_use_kerberos.value = koji_use_kerberos

+        self.koji_kerberos_principal.value = koji_kerberos_principal

+        self.koji_kerberos_keytab.value = koji_kerberos_keytab

         self.koji_task_id.value = koji_task_id

         self.pulp_secret.value = pulp_secret or source_secret

         self.pulp_registry.value = pulp_registry

@@ -248,8 +250,6 @@ class BuildSpec(object):

         self.smtp_uri.value = smtp_uri

         self.nfs_server_path.value = nfs_server_path

         self.nfs_dest_dir.value = nfs_dest_dir

-        self.git_push_url.value = git_push_url

-        self.git_push_username.value = git_push_username

         self.git_branch.value = git_branch

         self.name.value = make_name_from_git(self.git_uri.value, self.git_branch.value)

         if not base_image:

diff --git a/osbs/cli/main.py b/osbs/cli/main.py

index a828b97..6f6b118 100644

--- a/osbs/cli/main.py

+++ b/osbs/cli/main.py

@@ -10,6 +10,7 @@ import collections

 import json

 import logging

+import pkg_resources

 from textwrap import dedent

 import codecs

@@ -277,7 +278,6 @@ def cmd_build(args, osbs):

         git_ref=osbs.build_conf.get_git_ref(),

         git_branch=osbs.build_conf.get_git_branch(),

         user=osbs.build_conf.get_user(),

-        component=osbs.build_conf.get_component(),

         tag=osbs.build_conf.get_tag(),

         target=osbs.build_conf.get_koji_target(),

         architecture=osbs.build_conf.get_architecture(),

@@ -458,6 +458,11 @@ def str_on_2_unicode_on_3(s):

 def cli():

+    try:

+        version = pkg_resources.get_distribution("osbs-client").version

+    except pkg_resources.DistributionNotFound:

+        version = "GIT"

+

     parser = argparse.ArgumentParser(

         description="OpenShift Build Service client"

     )

@@ -466,6 +471,7 @@ def cli():

     # that the option was not specified

     exclusive_group.add_argument("--verbose", action="store_true", default=None)

     exclusive_group.add_argument("-q", "--quiet", action="store_true")

+    exclusive_group.add_argument("-V", "--version", action="version", version=version)

     subparsers = parser.add_subparsers(help='commands')

@@ -559,8 +565,8 @@ def cli():

                               help="build architecture")

     build_parser.add_argument("-u", "--user", action='store', required=True,

                               help="prefix for docker image repository")

-    build_parser.add_argument("-c", "--component", action='store', required=True,

-                              help="name of component")

+    build_parser.add_argument("-c", "--component", action='store', required=False,

+                              help="not used; use com.redhat.component label in Dockerfile")

     build_parser.add_argument("-A", "--tag", action='store', required=False,

                               help="tag of the built image (simple builds only)")

     build_parser.add_argument("--no-logs", action='store_true', required=False, default=False,

diff --git a/osbs/conf.py b/osbs/conf.py

index bb92ca7..97cd677 100644

--- a/osbs/conf.py

+++ b/osbs/conf.py

@@ -186,9 +186,6 @@ class Configuration(object):

         """ user namespace when tagging and pushing image """

         return self._get_value("user", self.conf_section, "user")

-    def get_component(self):

-        return self._get_value("component", self.conf_section, "component")

-

     def get_tag(self):

         return self._get_value("tag", self.conf_section, "tag")

@@ -211,6 +208,15 @@ class Configuration(object):

     def get_koji_certs_secret(self):

         return self._get_value("koji_certs_secret", self.conf_section, "koji_certs_secret")

+    def get_koji_use_kerberos(self):

+        return self._get_value("koji_use_kerberos", self.conf_section, "koji_use_kerberos", is_bool_val=True)

+

+    def get_koji_kerberos_keytab(self):

+        return self._get_value("koji_kerberos_keytab", self.conf_section, "koji_kerberos_keytab")

+

+    def get_koji_kerberos_principal(self):

+        return self._get_value("koji_kerberos_principal", self.conf_section, "koji_kerberos_principal")

+

     def get_sources_command(self):

         return self._get_value("sources_command", self.conf_section, "sources_command")

@@ -312,9 +318,8 @@ class Configuration(object):

         key = "builder_build_json_dir"

         builder_build_json_dir = self._get_value(key, self.conf_section, key)

         if builder_build_json_dir is None:

-            fallback_key = "build_json_dir"

-            logger.warning("%r not found, falling back %r", key, fallback_key)

-            builder_build_json_dir = self._get_value(fallback_key, self.conf_section, fallback_key)

+            logger.warning("%r not found, falling back to build_json_dir", key)

+            builder_build_json_dir = self.get_build_json_store()

         return builder_build_json_dir

     def get_pulp_secret(self):

@@ -353,12 +358,6 @@ class Configuration(object):

     def get_storage_limit(self):

         return self._get_value("storage_limit", self.conf_section, "storage_limit")

-    def get_git_push_url(self):

-        return self._get_value("git_push_url", self.conf_section, "git_push_url")

-

-    def get_git_push_username(self):

-        return self._get_value("git_push_username", self.conf_section, "git_push_username")

-

     def get_build_image(self):

         return self._get_value("build_image", self.conf_section, "build_image")

diff --git a/osbs/constants.py b/osbs/constants.py

index 649626c..282f002 100644

--- a/osbs/constants.py

+++ b/osbs/constants.py

@@ -18,6 +18,7 @@ DEFAULT_CONFIGURATION_FILE = "/etc/osbs.conf"

 DEFAULT_CONFIGURATION_SECTION = "default"

 DEFAULT_OUTER_TEMPLATE = "prod.json"

 DEFAULT_INNER_TEMPLATE = "prod_inner.json"

+DEFAULT_CUSTOMIZE_CONF = "prod_customize.json"

 GENERAL_CONFIGURATION_SECTION = "general"

 POD_FINISHED_STATES = ["failed", "succeeded"]

 POD_FAILED_STATES = ["failed"]

diff --git a/osbs/core.py b/osbs/core.py

index 9a93846..9eeeece 100755

--- a/osbs/core.py

+++ b/osbs/core.py

@@ -293,7 +293,7 @@ class Openshift(object):

     def cancel_build(self, build_id):

         response = self.get_build(build_id)

         br = BuildResponse(response.json())

-        br.status = BUILD_CANCELLED_STATE

+        br.cancelled = True

         url = self._build_url("builds/%s/" % build_id)

         return self._put(url, data=json.dumps(br.json),

                          headers={"Content-Type": "application/json"})

diff --git a/tests/build/test_build_request.py b/tests/build/test_build_request.py

index 6af5e53..c32b5d9 100644

--- a/tests/build/test_build_request.py

+++ b/tests/build/test_build_request.py

@@ -706,7 +706,8 @@ class TestBuildRequest(object):

         ['v1', 'v2'],

         ['v2'],

     ])

-    def test_render_prod_request_v1_v2(self, registry_api_versions):

+    @pytest.mark.parametrize('scratch', [False, True])

+    def test_render_prod_request_v1_v2(self, registry_api_versions, scratch):

         build_request = BuildRequest(INPUTS_PATH)

         name_label = "fedora/resultingimage"

         pulp_env = 'v1pulp'

@@ -747,6 +748,7 @@ class TestBuildRequest(object):

             'authoritative_registry': "registry.example.com",

             'distribution_scope': "authoritative-source-only",

             'registry_api_versions': registry_api_versions,

+            'scratch': scratch,

         })

         build_request.set_params(**kwargs)

         build_json = build_request.render()

@@ -799,8 +801,6 @@ class TestBuildRequest(object):

         with pytest.raises(NoSuchPluginException):

             get_plugin(plugins, "postbuild_plugins", "cp_built_image_to_nfs")

-        assert get_plugin(plugins, "postbuild_plugins", "compress")

-

         if 'v1' in registry_api_versions:

             assert get_plugin(plugins, "postbuild_plugins",

                               "pulp_push")

@@ -830,6 +830,16 @@ class TestBuildRequest(object):

             with pytest.raises(NoSuchPluginException):

                 get_plugin(plugins, "postbuild_plugins", "pulp_sync")

+        if scratch:

+            with pytest.raises(NoSuchPluginException):

+                get_plugin(plugins, "postbuild_plugins", "compress")

+

+            with pytest.raises(NoSuchPluginException):

+                get_plugin(plugins, "exit_plugins", "koji_promote")

+        else:

+            assert get_plugin(plugins, "postbuild_plugins", "compress")

+            assert get_plugin(plugins, "exit_plugins", "koji_promote")

+

     def test_render_with_yum_repourls(self):

         kwargs = {

             'git_uri': TEST_GIT_URI,

@@ -1040,7 +1050,6 @@ class TestBuildRequest(object):

         self.create_image_change_trigger_json(str(tmpdir))

         build_request = BuildRequest(str(tmpdir))

         name_label = "fedora/resultingimage"

-        push_url = "ssh://{username}git.example.com/git/{component}.git"

         pdc_secret_name = 'foo'

         kwargs = {

             'git_uri': TEST_GIT_URI,

@@ -1061,8 +1070,6 @@ class TestBuildRequest(object):

             'authoritative_registry': "registry.example.com",

             'distribution_scope': "authoritative-source-only",

             'registry_api_versions': ['v1'],

-            'git_push_url': push_url.format(username='', component=TEST_COMPONENT),

-            'git_push_username': 'example',

             'pdc_secret': pdc_secret_name,

             'pdc_url': 'https://pdc.example.com',

             'smtp_uri': 'smtp.example.com',

@@ -1127,57 +1134,38 @@ class TestBuildRequest(object):

                     'name': 'sendmail'}

         assert get_plugin(plugins, 'exit_plugins', 'sendmail') == expected

-    @pytest.mark.parametrize('missing', [

-        'git_branch',

-        'git_push_url',

-    ])

-    def test_render_prod_request_trigger_missing_param(self, tmpdir, missing):

+    def test_render_custom_base_image_with_trigger(self, tmpdir):

         self.create_image_change_trigger_json(str(tmpdir))

         build_request = BuildRequest(str(tmpdir))

-        push_url = "ssh://{username}git.example.com/git/{component}.git"