From 55ff3aa3e4103a4897cd31009b50b02a0651902b Mon Sep 17 00:00:00 2001 From: Yury Gaydaychuk Date: Mon, 29 Apr 2024 14:16:12 +0200 Subject: [PATCH] [Commit slider] AC job improvements (#24002) ### Details: - *item1* - *...* ### Tickets: - *ticket-id* --- .../intel_cpu/tools/commit_slider/utils/common_mode.py | 2 -- .../intel_cpu/tools/commit_slider/utils/e2e_preparator.py | 2 +- src/plugins/intel_cpu/tools/commit_slider/utils/helpers.py | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/common_mode.py b/src/plugins/intel_cpu/tools/commit_slider/utils/common_mode.py index d0e1c11e871..16400cdde65 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/common_mode.py +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/common_mode.py @@ -135,8 +135,6 @@ class Mode(ABC): # fetch paths for dlb job if cfg["dlbConfig"]["launchedAsJob"]: cfg["appPath"] = cfg["dlbConfig"]["appPath"] - if cfg["dlbConfig"]["appCmd"] != "" : - cfg["appCmd"] = cfg["dlbConfig"]["appCmd"] # switch off illegal check if not self.traversal.isComparative(): cfg["checkIfBordersDiffer"] = False diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/e2e_preparator.py b/src/plugins/intel_cpu/tools/commit_slider/utils/e2e_preparator.py index 6a8eae2d7ec..de96a65d47c 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/e2e_preparator.py +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/e2e_preparator.py @@ -11,7 +11,7 @@ try: except: import subprocess import sys - p = subprocess.Popen('{py} -m pip install pyyaml'.format( + p = subprocess.Popen('{} -m pip install pyyaml'.format( sys.executable ), shell=True, diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/helpers.py b/src/plugins/intel_cpu/tools/commit_slider/utils/helpers.py index d6ad39151f6..c705e8b362c 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/helpers.py +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/helpers.py @@ -286,10 +286,14 @@ def fetchAppOutput(cfg, commit): output = "" if cfg["venvCfg"]["venvEnabled"]: + # todo - move to substitution rules for item in [ {"src": cfg["venvCfg"]["venvName"], "dst": "venvName"}, {"src": cfg["appPath"], "dst": "appPath"}, - {"src": sys.executable, "dst": "py"} + {"src": sys.executable, "dst": "py"}, + # for AC case + {"src": cfg["dlbConfig"]["appCmd"], "dst": "appCmd"}, + {"src": cfg["dlbConfig"]["toolPath"], "dst": "toolPath"} ]: appCmd = multistepStrFormat( appCmd,