diff options
author | Simo Fält <simo.falt@qt.io> | 2021-06-15 10:14:30 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-01 20:10:52 +0000 |
commit | b0e4946a9b8cbdb115e7672ddecd48534f0a7515 (patch) | |
tree | 1c2b67ce052569f848d8d5a1ec1e2920f63f1c72 /coin_test_instructions.py | |
parent | a0d1543b0bb5ce5746a22d21fc413274994d7a3d (diff) |
Enable CI test on arm64
Change-Id: I26aff00644d85931b5e8ac597c1c5c3c9edb74e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4debb1824ab57fc1529db630f51366ece7398f74)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin_test_instructions.py')
-rw-r--r-- | coin_test_instructions.py | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 46fb60704..13de48f4b 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -73,22 +73,27 @@ def call_testrunner(python_ver, buildnro): python3 = "python3" if sys.platform == "win32": python3 = os.path.join(os.getenv("PYTHON3_PATH"), "python.exe") - run_instruction([python3, "-m", "pip", "install", "--user", "virtualenv==20.7.2"], "Failed to pin virtualenv") # installing to user base might not be in PATH by default. - # installing to user base might not be in PATH by default. - env_path = os.path.join(site.USER_BASE, "bin") - v_env = os.path.join(env_path, "virtualenv") - if sys.platform == "win32": - env_path = os.path.join(site.USER_BASE, "Scripts") - v_env = os.path.join(env_path, "virtualenv.exe") - try: - run_instruction([v_env, "--version"], "Using default virtualenv") - except Exception as e: + + if CI_HOST_OS == "MacOS" and CI_HOST_ARCH == "ARM64": # we shouldn't install anything to m1, while it is not virtualized v_env = "virtualenv" + run_instruction([v_env, "-p", _pExe, _env], "Failed to create virtualenv") + else: + run_instruction([python3, "-m", "pip", "install", "--user", "virtualenv==20.7.2"], "Failed to pin virtualenv") + # installing to user base might not be in PATH by default. + env_path = os.path.join(site.USER_BASE, "bin") + v_env = os.path.join(env_path, "virtualenv") + if sys.platform == "win32": + env_path = os.path.join(site.USER_BASE, "Scripts") + v_env = os.path.join(env_path, "virtualenv.exe") + try: + run_instruction([v_env, "--version"], "Using default virtualenv") + except Exception as e: + v_env = "virtualenv" + run_instruction([v_env, "-p", _pExe, _env], "Failed to create virtualenv") + # When the 'python_ver' variable is empty, we are using Python 2 + # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue + run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") - run_instruction([v_env, "-p", _pExe, _env], "Failed to create virtualenv") - # When the 'python_ver' variable is empty, we are using Python 2 - # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue - run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") cmd = [env_python, "testrunner.py", "test", "--blacklist", "build_history/blacklist.txt", "--buildno=" + buildnro] |