diff --git a/Providers/Scripts/2.4x-2.5x/Scripts/nxOMSAutomationWorker.py b/Providers/Scripts/2.4x-2.5x/Scripts/nxOMSAutomationWorker.py index ec4763e88..b83409cd2 100644 --- a/Providers/Scripts/2.4x-2.5x/Scripts/nxOMSAutomationWorker.py +++ b/Providers/Scripts/2.4x-2.5x/Scripts/nxOMSAutomationWorker.py @@ -715,7 +715,7 @@ def kill_worker_manager(workspace_id): Exceptions: throws exception if process was running and could not be killed """ - pattern_match_string = "python\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id) + pattern_match_string = "python2\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id) retval = kill_process_by_pattern_string(pattern_match_string) # can't depend on the return value to ensure that the process was killed since it pattern matches diff --git a/Providers/Scripts/2.6x-2.7x/Scripts/nxOMSAutomationWorker.py b/Providers/Scripts/2.6x-2.7x/Scripts/nxOMSAutomationWorker.py index ec4763e88..b83409cd2 100644 --- a/Providers/Scripts/2.6x-2.7x/Scripts/nxOMSAutomationWorker.py +++ b/Providers/Scripts/2.6x-2.7x/Scripts/nxOMSAutomationWorker.py @@ -715,7 +715,7 @@ def kill_worker_manager(workspace_id): Exceptions: throws exception if process was running and could not be killed """ - pattern_match_string = "python\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id) + pattern_match_string = "python2\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id) retval = kill_process_by_pattern_string(pattern_match_string) # can't depend on the return value to ensure that the process was killed since it pattern matches diff --git a/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py b/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py index b0308a92a..c02e54a95 100644 --- a/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py +++ b/Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py @@ -58,7 +58,7 @@ DEFAULT_VM_ID = DEFAULT_UNKNOWN DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN DEFAULT_COMPONENT = DEFAULT_UNKNOWN -DEFAULT_WORKER_VERSION = "1.10.0.0" +DEFAULT_WORKER_VERSION = "1.10.1.0" DEFAULT_JRDS_POLLING_FREQUENCY = "30" # state configuration keys diff --git a/Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py b/Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py index a26220914..8fa9a6512 100644 --- a/Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py +++ b/Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py @@ -56,7 +56,7 @@ DEFAULT_VM_ID = DEFAULT_UNKNOWN DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN DEFAULT_COMPONENT = DEFAULT_UNKNOWN -DEFAULT_WORKER_VERSION = "1.10.0.0" +DEFAULT_WORKER_VERSION = "1.10.1.0" DEFAULT_JRDS_POLLING_FREQUENCY = "30" # state configuration keys diff --git a/Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py b/Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py index 79dab1f8a..21be374ae 100644 --- a/Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py +++ b/Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py @@ -55,7 +55,7 @@ DEFAULT_VM_ID = DEFAULT_UNKNOWN DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN DEFAULT_COMPONENT = DEFAULT_UNKNOWN -DEFAULT_WORKER_VERSION = "1.10.0.0" +DEFAULT_WORKER_VERSION = "1.10.1.0" DEFAULT_JRDS_POLLING_FREQUENCY = "30" # state configuration keys