diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c7fa3f9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "plugin-test-examples/plugin_test/fuel-qa"]
+	path = plugin-test-examples/plugin_test/fuel-qa
+	url = https://github.com/stackforge/fuel-qa/
diff --git a/plugin-test-examples/plugin_test/__init__.py b/plugin-test-examples/plugin_test/__init__.py
new file mode 100755
index 0000000..b5ff96e
--- /dev/null
+++ b/plugin-test-examples/plugin_test/__init__.py
@@ -0,0 +1,13 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/plugin-test-examples/plugin_test/fuel-qa b/plugin-test-examples/plugin_test/fuel-qa
new file mode 160000
index 0000000..381e384
--- /dev/null
+++ b/plugin-test-examples/plugin_test/fuel-qa
@@ -0,0 +1 @@
+Subproject commit 381e3848da092b7e143be8ab3bb689af62f442bc
diff --git a/plugin-test-examples/plugin_test/helpers/__init__.py b/plugin-test-examples/plugin_test/helpers/__init__.py
new file mode 100755
index 0000000..b5ff96e
--- /dev/null
+++ b/plugin-test-examples/plugin_test/helpers/__init__.py
@@ -0,0 +1,13 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/plugin-test-examples/plugin_test/helpers/openstack.py b/plugin-test-examples/plugin_test/helpers/openstack.py
new file mode 100755
index 0000000..3684f08
--- /dev/null
+++ b/plugin-test-examples/plugin_test/helpers/openstack.py
@@ -0,0 +1,52 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import time
+from fuelweb_test import logger
+from fuelweb_test.settings import DEPLOYMENT_MODE
+from fuelweb_test.helpers.checkers import check_repo_managment
+
+
+def assign_net_provider(obj, pub_all_nodes=False, ceph_value=False):
+    """Assign neutron with tunneling segmentation"""
+    segment_type = 'tun'
+    obj.cluster_id = obj.fuel_web.create_cluster(
+        name=obj.__class__.__name__,
+        mode=DEPLOYMENT_MODE,
+        settings={
+            "net_provider": 'neutron',
+            "net_segment_type": segment_type,
+            "assign_to_all_nodes": pub_all_nodes,
+            "images_ceph": ceph_value
+            }
+    )
+    return obj.cluster_id
+
+
+def deploy_cluster(obj):
+    """
+    Deploy cluster with additional time for waiting on node's availability
+    """
+    try:
+        obj.fuel_web.deploy_cluster_wait(
+            obj.cluster_id, check_services=False)
+    except:
+        nailgun_nodes = obj.env.fuel_web.client.list_cluster_nodes(
+            obj.env.fuel_web.get_last_created_cluster())
+        time.sleep(420)
+        for n in nailgun_nodes:
+            check_repo_managment(
+                obj.env.d_env.get_ssh_to_remote(n['ip']))
+            logger.info('ip is {0}'.format(n['ip'], n['name']))
diff --git a/plugin-test-examples/plugin_test/helpers/plugin.py b/plugin-test-examples/plugin_test/helpers/plugin.py
new file mode 100755
index 0000000..8ea172e
--- /dev/null
+++ b/plugin-test-examples/plugin_test/helpers/plugin.py
@@ -0,0 +1,53 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import time
+from fuelweb_test import logger
+from fuelweb_test.helpers import checkers
+from fuelweb_test.settings import PLUGIN_PATH
+from proboscis.asserts import assert_true
+import openstack
+
+
+def prepare_test_plugin(
+        obj, slaves=None, pub_all_nodes=False, ceph_value=False):
+    """Copy necessary packages to the master node and install them"""
+
+    obj.env.revert_snapshot("ready_with_%d_slaves" % slaves)
+
+    # copy plugin to the master node
+    checkers.upload_tarball(
+        obj.env.d_env.get_admin_remote(),
+        PLUGIN_PATH, '/var')
+
+    # install plugin
+    checkers.install_plugin_check_code(
+        obj.env.d_env.get_admin_remote(),
+        plugin=os.path.basename(PLUGIN_PATH))
+
+    # prepare fuel
+    openstack.assign_net_provider(obj, pub_all_nodes, ceph_value)
+
+
+def activate_plugin(obj):
+    """Enable plugin in settings"""
+    plugin_name = 'testplugin'
+    msg = "Plugin couldn't be enabled. Check plugin version. Test aborted"
+    assert_true(
+        obj.fuel_web.check_plugin_exists(obj.cluster_id, plugin_name),
+        msg)
+    logger.debug('we have plugin element')
+    option = {'metadata/enabled': True, }
+    obj.fuel_web.update_plugin_data(obj.cluster_id, plugin_name, option)
diff --git a/plugin-test-examples/plugin_test/run_tests.py b/plugin-test-examples/plugin_test/run_tests.py
new file mode 100755
index 0000000..4217964
--- /dev/null
+++ b/plugin-test-examples/plugin_test/run_tests.py
@@ -0,0 +1,67 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import sys
+
+import os
+import re
+from nose.plugins import Plugin
+from paramiko.transport import _join_lingering_threads
+
+
+class CloseSSHConnectionsPlugin(Plugin):
+    """Closes all paramiko's ssh connections after each test case
+
+    Plugin fixes proboscis disability to run cleanup of any kind.
+    'afterTest' calls _join_lingering_threads function from paramiko,
+    which stops all threads (set the state to inactive and joins for 10s)
+    """
+    name = 'closesshconnections'
+
+    def options(self, parser, env=os.environ):
+        super(CloseSSHConnectionsPlugin, self).options(parser, env=env)
+
+    def configure(self, options, conf):
+        super(CloseSSHConnectionsPlugin, self).configure(options, conf)
+        self.enabled = True
+
+    def afterTest(self, *args, **kwargs):
+        _join_lingering_threads()
+
+
+def import_tests():
+    from tests import test_smoke_bvt
+    from tests import integration_tests
+
+
+def run_tests():
+    from proboscis import TestProgram  # noqa
+    import_tests()
+
+    # Run Proboscis and exit.
+    TestProgram(
+        addplugins=[CloseSSHConnectionsPlugin()]
+    ).run_and_exit()
+
+
+if __name__ == '__main__':
+    sys.path.append(sys.path[0]+"/fuel-qa")
+    import_tests()
+    from fuelweb_test.helpers.patching import map_test
+    if any(re.search(r'--group=patching_master_tests', arg)
+           for arg in sys.argv):
+        map_test('master')
+    elif any(re.search(r'--group=patching.*', arg) for arg in sys.argv):
+        map_test('environment')
+    run_tests()
diff --git a/plugin-test-examples/plugin_test/tests/__init__.py b/plugin-test-examples/plugin_test/tests/__init__.py
new file mode 100755
index 0000000..b5ff96e
--- /dev/null
+++ b/plugin-test-examples/plugin_test/tests/__init__.py
@@ -0,0 +1,13 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/plugin-test-examples/plugin_test/tests/integration_tests.py b/plugin-test-examples/plugin_test/tests/integration_tests.py
new file mode 100755
index 0000000..b5ff96e
--- /dev/null
+++ b/plugin-test-examples/plugin_test/tests/integration_tests.py
@@ -0,0 +1,13 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/plugin-test-examples/plugin_test/tests/test_smoke_bvt.py b/plugin-test-examples/plugin_test/tests/test_smoke_bvt.py
new file mode 100755
index 0000000..8908bfd
--- /dev/null
+++ b/plugin-test-examples/plugin_test/tests/test_smoke_bvt.py
@@ -0,0 +1,60 @@
+#    Copyright 2015 Mirantis, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import os.path
+from proboscis import test
+from fuelweb_test.helpers.decorators import log_snapshot_after_test
+from fuelweb_test import logger
+from fuelweb_test.tests.base_test_case import SetupEnvironment
+from fuelweb_test.tests.base_test_case import TestBasic
+from helpers import plugin
+from helpers import openstack
+
+
+@test(groups=["plugins"])
+class TestPlugin(TestBasic):
+
+    ostf_msg = 'OSTF tests passed successfully.'
+
+    cluster_id = ''
+
+    @test(depends_on=[SetupEnvironment.prepare_slaves_3],
+          groups=["install_testplugin"])
+    @log_snapshot_after_test
+    def install_testplugin(self):
+        """Install Plugin and create cluster
+
+        Scenario:
+            1. Revert snapshot "ready_with_3_slaves"
+            2. Upload plugin to the master node
+            3. Install plugin and additional packages
+            4. Enable Neutron with tunneling segmentation
+            5. Create cluster
+
+        Duration 20 min
+
+        """
+
+        plugin.prepare_test_plugin(self, slaves=3)
+
+    @test(depends_on=[SetupEnvironment.prepare_slaves_3],
+          groups=["plugin_smoke"])
+    @log_snapshot_after_test
+   
+    self.fuel_web.run_ostf(
+        cluster_id=self.cluster_id,
+        should_fail=2,
+        failed_test_name=[('Check network connectivity from instance via floating IP'),('Launch instance with file injection')]
+    )
diff --git a/plugin-test-examples/plugin_test/utils/jenkins/system_tests.sh b/plugin-test-examples/plugin_test/utils/jenkins/system_tests.sh
new file mode 100755
index 0000000..6cc4259
--- /dev/null
+++ b/plugin-test-examples/plugin_test/utils/jenkins/system_tests.sh
@@ -0,0 +1,496 @@
+#!/bin/sh
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
+# functions
+
+INVALIDOPTS_ERR=100
+NOJOBNAME_ERR=101
+NOISOPATH_ERR=102
+NOTASKNAME_ERR=103
+NOWORKSPACE_ERR=104
+DEEPCLEAN_ERR=105
+MAKEISO_ERR=106
+NOISOFOUND_ERR=107
+COPYISO_ERR=108
+SYMLINKISO_ERR=109
+CDWORKSPACE_ERR=110
+ISODOWNLOAD_ERR=111
+INVALIDTASK_ERR=112
+
+# Defaults
+
+export REBOOT_TIMEOUT=${REBOOT_TIMEOUT:-5000}
+export ALWAYS_CREATE_DIAGNOSTIC_SNAPSHOT=${ALWAYS_CREATE_DIAGNOSTIC_SNAPSHOT:-true}
+
+# Export specified settings
+if [ -z $NODE_VOLUME_SIZE ]; then export NODE_VOLUME_SIZE=350; fi
+if [ -z $OPENSTACK_RELEASE ]; then export OPENSTACK_RELEASE=Ubuntu; fi
+if [ -z $ENV_NAME ]; then export ENV_NAME="contrail"; fi
+if [ -z $ADMIN_NODE_MEMORY ]; then export ADMIN_NODE_MEMORY=4096; fi
+if [ -z $ADMIN_NODE_CPU ]; then export ADMIN_NODE_CPU=4; fi
+if [ -z $SLAVE_NODE_MEMORY ]; then export SLAVE_NODE_MEMORY=4096; fi
+if [ -z $SLAVE_NODE_CPU ]; then export SLAVE_NODE_CPU=4; fi
+
+# Init and update submodule
+git submodule init && git submodule update
+
+sudo /sbin/iptables -F
+sudo /sbin/iptables -t nat -F
+sudo /sbin/iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+
+
+ShowHelp() {
+cat << EOF
+System Tests Script
+
+It can perform several actions depending on Jenkins JOB_NAME it's ran from
+or it can take names from exported environment variables or command line options
+if you do need to override them.
+
+-w (dir)    - Path to workspace where fuelweb git repository was checked out.
+              Uses Jenkins' WORKSPACE if not set
+-e (name)   - Directly specify environment name used in tests
+              Uses ENV_NAME variable is set.
+-j (name)   - Name of this job. Determines ISO name, Task name and used by tests.
+              Uses Jenkins' JOB_NAME if not set
+-v          - Do not use virtual environment
+-V (dir)    - Path to python virtual environment
+-i (file)   - Full path to ISO file to build or use for tests.
+              Made from iso dir and name if not set.
+-t (name)   - Name of task this script should perform. Should be one of defined ones.
+              Taken from Jenkins' job's suffix if not set.
+-o (str)    - Allows you any extra command line option to run test job if you
+              want to use some parameters.
+-a (str)    - Allows you to path NOSE_ATTR to the test job if you want
+              to use some parameters.
+-A (str)    - Allows you to path  NOSE_EVAL_ATTR if you want to enter attributes
+              as python expressions.
+-m (name)   - Use this mirror to build ISO from.
+              Uses 'srt' if not set.
+-U          - ISO URL for tests.
+              Null by default.
+-r (yes/no) - Should built ISO file be places with build number tag and
+              symlinked to the last build or just copied over the last file.
+-b (num)    - Allows you to override Jenkins' build number if you need to.
+-l (dir)    - Path to logs directory. Can be set by LOGS_DIR evironment variable.
+              Uses WORKSPACE/logs if not set.
+-d          - Dry run mode. Only show what would be done and do nothing.
+              Useful for debugging.
+-k          - Keep previously created test environment before tests run
+-K          - Keep test environment after tests are finished
+-h          - Show this help page
+
+Most variables uses guesing from Jenkins' job name but can be overriden
+by exported variable before script is run or by one of command line options.
+
+You can override following variables using export VARNAME="value" before running this script
+WORKSPACE  - path to directory where Fuelweb repository was checked out by Jenkins or manually
+JOB_NAME   - name of Jenkins job that determines which task should be done and ISO file name.
+
+If task name is "iso" it will make iso file
+Other defined names will run Nose tests using previously built ISO file.
+
+ISO file name is taken from job name prefix
+Task name is taken from job name suffix
+Separator is one dot '.'
+
+For example if JOB_NAME is:
+mytest.somestring.iso
+ISO name: mytest.iso
+Task name: iso
+If ran with such JOB_NAME iso file with name mytest.iso will be created
+
+If JOB_NAME is:
+mytest.somestring.node
+ISO name: mytest.iso
+Task name: node
+If script was run with this JOB_NAME node tests will be using ISO file mytest.iso.
+
+First you should run mytest.somestring.iso job to create mytest.iso.
+Then you can ran mytest.somestring.node job to start tests using mytest.iso and other tests too.
+EOF
+}
+
+GlobalVariables() {
+  # where built iso's should be placed
+  # use hardcoded default if not set before by export
+  ISO_DIR="${ISO_DIR:=/var/www/fuelweb-iso}"
+
+  # name of iso file
+  # taken from jenkins job prefix
+  # if not set before by variable export
+  if [ -z "${ISO_NAME}" ]; then
+    ISO_NAME="${JOB_NAME%.*}.iso"
+  fi
+
+  # full path where iso file should be placed
+  # make from iso name and path to iso shared directory
+  # if was not overriden by options or export
+  if [ -z "${ISO_PATH}" ]; then
+    ISO_PATH="${ISO_DIR}/${ISO_NAME}"
+  fi
+
+  # what task should be ran
+  # it's taken from jenkins job name suffix if not set by options
+  if [ -z "${TASK_NAME}" ]; then
+    TASK_NAME="${JOB_NAME##*.}"
+  fi
+
+  # do we want to keep iso's for each build or just copy over single file
+  ROTATE_ISO="${ROTATE_ISO:=yes}"
+
+  # choose mirror to build iso from. Default is 'srt' for Saratov's mirror
+  # you can change mirror by exporting USE_MIRROR variable before running this script
+  USE_MIRROR="${USE_MIRROR:=srt}"
+
+  # only show what commands would be executed but do nothing
+  # this feature is usefull if you want to debug this script's behaviour
+  DRY_RUN="${DRY_RUN:=no}"
+
+  VENV="${VENV:=yes}"
+}
+
+GetoptsVariables() {
+  while getopts ":w:j:i:t:o:a:A:m:U:r:b:V:l:dkKe:v:h" opt; do
+    case $opt in
+      w)
+        WORKSPACE="${OPTARG}"
+        ;;
+      j)
+        JOB_NAME="${OPTARG}"
+        ;;
+      i)
+        ISO_PATH="${OPTARG}"
+        ;;
+      t)
+        TASK_NAME="${OPTARG}"
+        ;;
+      o)
+        TEST_OPTIONS="${TEST_OPTIONS} ${OPTARG}"
+        ;;
+      a)
+        NOSE_ATTR="${OPTARG}"
+        ;;
+      A)
+        NOSE_EVAL_ATTR="${OPTARG}"
+        ;;
+      m)
+        USE_MIRROR="${OPTARG}"
+        ;;
+      U)
+        ISO_URL="${OPTARG}"
+        ;;
+      r)
+        ROTATE_ISO="${OPTARG}"
+        ;;
+      b)
+        BUILD_NUMBER="${OPTARG}"
+        ;;
+      V)
+        VENV_PATH="${OPTARG}"
+        ;;
+      l)
+        LOGS_DIR="${OPTARG}"
+        ;;
+      k)
+        KEEP_BEFORE="yes"
+        ;;
+      K)
+        KEEP_AFTER="yes"
+        ;;
+      e)
+        ENV_NAME="${OPTARG}"
+        ;;
+      d)
+        DRY_RUN="yes"
+        ;;
+      v)
+        VENV="no"
+        ;;
+      h)
+        ShowHelp
+        exit 0
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG"
+        ShowHelp
+        exit $INVALIDOPTS_ERR
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument."
+        ShowHelp
+        exit $INVALIDOPTS_ERR
+        ;;
+    esac
+  done
+}
+
+CheckVariables() {
+
+  if [ -z "${JOB_NAME}" ]; then
+    echo "Error! JOB_NAME is not set!"
+    exit $NOJOBNAME_ERR
+  fi
+
+  if [ -z "${ISO_PATH}" ]; then
+    echo "Error! ISO_PATH is not set!"
+    exit $NOISOPATH_ERR
+  fi
+
+  if [ -z "${TASK_NAME}" ]; then
+    echo "Error! TASK_NAME is not set!"
+    exit $NOTASKNAME_ERR
+  fi
+
+  if [ -z "${WORKSPACE}" ]; then
+    echo "Error! WORKSPACE is not set!"
+    exit $NOWORKSPACE_ERR
+  fi
+}
+
+MakeISO() {
+  # Create iso file to be used in tests
+
+  # clean previous garbage
+  if [ "${DRY_RUN}" = "yes" ]; then
+    echo make deep_clean
+  else
+    make deep_clean
+  fi
+  ec="${?}"
+
+  if [ "${ec}" -gt "0" ]; then
+    echo "Error! Deep clean failed!"
+    exit $DEEPCLEAN_ERR
+  fi
+
+  # create ISO file
+  export USE_MIRROR
+  if [ "${DRY_RUN}" = "yes" ]; then
+    echo make iso
+  else
+    make iso
+  fi
+  ec=$?
+
+  if [ "${ec}" -gt "0" ]; then
+    echo "Error making ISO!"
+    exit $MAKEISO_ERR
+  fi
+
+  if [ "${DRY_RUN}" = "yes" ]; then
+    ISO="${WORKSPACE}/build/iso/fuel.iso"
+  else
+    ISO="`ls ${WORKSPACE}/build/iso/*.iso | head -n 1`"
+    # check that ISO file exists
+    if [ ! -f "${ISO}" ]; then
+      echo "Error! ISO file not found!"
+      exit $NOISOFOUND_ERR
+    fi
+  fi
+
+  # copy ISO file to storage dir
+  # if rotation is enabled and build number is aviable
+  # save iso to tagged file and symlink to the last build
+  # if rotation is not enabled just copy iso to iso_dir
+
+  if [ "${ROTATE_ISO}" = "yes" -a "${BUILD_NUMBER}" != "" ]; then
+    # copy iso file to shared dir with revision tagged name
+    NEW_BUILD_ISO_PATH="${ISO_PATH#.iso}_${BUILD_NUMBER}.iso"
+    if [ "${DRY_RUN}" = "yes" ]; then
+      echo cp "${ISO}" "${NEW_BUILD_ISO_PATH}"
+    else
+      cp "${ISO}" "${NEW_BUILD_ISO_PATH}"
+    fi
+    ec=$?
+
+    if [ "${ec}" -gt "0" ]; then
+      echo "Error! Copy ${ISO} to ${NEW_BUILD_ISO_PATH} failed!"
+      exit $COPYISO_ERR
+    fi
+
+    # create symlink to the last built ISO file
+    if [ "${DRY_RUN}" = "yes" ]; then
+      echo ln -sf "${NEW_BUILD_ISO_PATH}" "${ISO_PATH}"
+    else
+      ln -sf "${NEW_BUILD_ISO_PATH}" "${ISO_PATH}"
+    fi
+    ec=$?
+
+    if [ "${ec}" -gt "0" ]; then
+      echo "Error! Create symlink from ${NEW_BUILD_ISO_PATH} to ${ISO_PATH} failed!"
+      exit $SYMLINKISO_ERR
+    fi
+  else
+    # just copy file to shared dir
+    if [ "${DRY_RUN}" = "yes" ]; then
+      echo cp "${ISO}" "${ISO_PATH}"
+    else
+      cp "${ISO}" "${ISO_PATH}"
+    fi
+    ec=$?
+
+    if [ "${ec}" -gt "0" ]; then
+      echo "Error! Copy ${ISO} to ${ISO_PATH} failed!"
+      exit $COPYISO_ERR
+    fi
+  fi
+
+  if [ "${ec}" -gt "0" ]; then
+    echo "Error! Copy ISO from ${ISO} to ${ISO_PATH} failed!"
+    exit $COPYISO_ERR
+  fi
+  echo "Finished building ISO: ${ISO_PATH}"
+  exit 0
+}
+
+CdWorkSpace() {
+    # chdir into workspace or fail if could not
+    if [ "${DRY_RUN}" != "yes" ]; then
+        cd "${WORKSPACE}"
+        ec=$?
+
+        if [ "${ec}" -gt "0" ]; then
+            echo "Error! Cannot cd to WORKSPACE!"
+            exit $CDWORKSPACE_ERR
+        fi
+    else
+        echo cd "${WORKSPACE}"
+    fi
+}
+
+RunTest() {
+    # Run test selected by task name
+
+    # check if iso file exists
+    if [ ! -f "${ISO_PATH}" ]; then
+        if [ -z "${ISO_URL}" -a "${DRY_RUN}" != "yes" ]; then
+            echo "Error! File ${ISO_PATH} not found and no ISO_URL (-U key) for downloading!"
+            exit $NOISOFOUND_ERR
+        else
+            if [ "${DRY_RUN}" = "yes" ]; then
+                echo wget -c ${ISO_URL} -O ${ISO_PATH}
+            else
+                echo "No ${ISO_PATH} found. Trying to download file."
+                wget -c ${ISO_URL} -O ${ISO_PATH}
+                rc=$?
+                if [ $rc -ne 0 ]; then
+                    echo "Failed to fetch ISO from ${ISO_URL}"
+                    exit $ISODOWNLOAD_ERR
+                fi
+            fi
+        fi
+    fi
+
+    if [ -z "${VENV_PATH}" ]; then
+        VENV_PATH="/home/jenkins/venv-nailgun-tests"
+    fi
+
+    # run python virtualenv
+    if [ "${VENV}" = "yes" ]; then
+        if [ "${DRY_RUN}" = "yes" ]; then
+            echo . $VENV_PATH/bin/activate
+        else
+            . $VENV_PATH/bin/activate
+        fi
+    fi
+
+    if [ "${ENV_NAME}" = "" ]; then
+      ENV_NAME="${JOB_NAME}_system_test"
+    fi
+
+    if [ "${LOGS_DIR}" = "" ]; then
+      LOGS_DIR="${WORKSPACE}/logs"
+    fi
+
+    if [ ! -f "$LOGS_DIR" ]; then
+      mkdir -p $LOGS_DIR
+    fi
+
+    export ENV_NAME
+    export LOGS_DIR
+    export ISO_PATH
+
+    if [ "${KEEP_BEFORE}" != "yes" ]; then
+      # remove previous environment
+      if [ "${DRY_RUN}" = "yes" ]; then
+        echo dos.py erase "${ENV_NAME}"
+      else
+        if [ $(dos.py list | grep "^${ENV_NAME}\$") ]; then
+          dos.py erase "${ENV_NAME}"
+        fi
+      fi
+    fi
+
+    # gather additional option for this nose test run
+    OPTS=""
+    if [ -n "${NOSE_ATTR}" ]; then
+        OPTS="${OPTS} -a ${NOSE_ATTR}"
+    fi
+    if [ -n "${NOSE_EVAL_ATTR}" ]; then
+        OPTS="${OPTS} -A ${NOSE_EVAL_ATTR}"
+    fi
+    if [ -n "${TEST_OPTIONS}" ]; then
+        OPTS="${OPTS} ${TEST_OPTIONS}"
+    fi
+
+    # run python test set to create environments, deploy and test product
+    if [ "${DRY_RUN}" = "yes" ]; then
+        echo export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
+        echo python plugin_test/run_tests.py -q --nologcapture --with-xunit ${OPTS}
+    else
+        export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
+        echo ${PYTHONPATH}
+        python plugin_test/run_tests.py -q --nologcapture --with-xunit ${OPTS}
+
+    fi
+    ec=$?
+
+    if [ "${KEEP_AFTER}" != "yes" ]; then
+      # remove environment after tests
+      if [ "${DRY_RUN}" = "yes" ]; then
+        echo dos.py destroy "${ENV_NAME}"
+      else
+        dos.py destroy "${ENV_NAME}"
+      fi
+    fi
+
+    exit "${ec}"
+}
+
+RouteTasks() {
+  # this selector defines task names that are recognised by this script
+  # and runs corresponding jobs for them
+  # running any jobs should exit this script
+
+  case "${TASK_NAME}" in
+  test)
+    RunTest
+    ;;
+  iso)
+    MakeISO
+    ;;
+  *)
+    echo "Unknown task: ${TASK_NAME}!"
+    exit $INVALIDTASK_ERR
+    ;;
+  esac
+  exit 0
+}
+
+# MAIN
+
+# first we want to get variable from command line options
+GetoptsVariables ${@}
+
+# then we define global variables and there defaults when needed
+GlobalVariables
+
+# check do we have all critical variables set
+CheckVariables
+
+# first we chdir into our working directory unless we dry run
+CdWorkSpace
+
+# finally we can choose what to do according to TASK_NAME
+RouteTasks