diff --git a/common.json b/common.json index 765a9f52..dd3f685e 100644 --- a/common.json +++ b/common.json @@ -4,7 +4,7 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.22.3", + "mx_version": "7.22.6", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 3cfcae32..e1038dde 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18149,7 +18149,7 @@ def alarm_handler(signum, frame): _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache')) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.22.6") # Stop MaxRssCopyRule of the rsspercentiles tracker from rerunning +version = VersionSpec("7.22.7") # Use current python for rsspercentiles _mx_start_datetime = datetime.utcnow() diff --git a/src/mx/_impl/mx_benchmark.py b/src/mx/_impl/mx_benchmark.py index acff6178..a2faffa3 100644 --- a/src/mx/_impl/mx_benchmark.py +++ b/src/mx/_impl/mx_benchmark.py @@ -2921,7 +2921,7 @@ def map_command(self, cmd): self.most_recent_text_output = text_output ps_poller_script_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "ps_poller.py") - return ["python3", ps_poller_script_path, "-f", text_output, "-i", str(RssPercentilesTracker.poll_interval)] + cmd + return [sys.executable, ps_poller_script_path, "-f", text_output, "-i", str(RssPercentilesTracker.poll_interval)] + cmd def get_rules(self, bmSuiteArgs): if self.copy_into_max_rss: