diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-06-25 09:18:09 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-06-26 14:11:10 +0300 |
| commit | b7e8b5e4114c034a750433d661b20944ce8b303c (patch) | |
| tree | 92caa243819119763bec0aa35d5b22453cc12543 | |
| parent | 4a4e44c6f8487f882d443ebfc05795cc75ba5e6e (diff) | |
Update virtualenv to 20.0.25
Updating virtualenv version to 20.0.25 while previous started to
fail. Also increasing the timeout value for output.
Change-Id: I391c1c85d490b57cdbab41d5bfcba396384c1994
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 2 | ||||
| -rw-r--r-- | coin_build_instructions.py | 4 | ||||
| -rw-r--r-- | coin_test_instructions.py | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml index 87abb476c..a00f5676e 100644 --- a/coin/instructions/execute_test_instructions.yaml +++ b/coin/instructions/execute_test_instructions.yaml @@ -30,7 +30,7 @@ instructions: - type: ExecuteCommand command: "c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 300 + maxTimeBetweenOutput: 500 enable_if: condition: property property: host.os diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 5c3033b04..5d11e9d52 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -47,6 +47,8 @@ from build_scripts.utils import get_ci_qmake_path import os import datetime import calendar +import site +import sys # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -110,7 +112,7 @@ def call_setup(python_ver, phase): if phase in ["BUILD"]: rmtree(_env, True) # Pinning the virtualenv before creating one - run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv") + run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv") run_instruction(["virtualenv", "-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 diff --git a/coin_test_instructions.py b/coin_test_instructions.py index c3752cb9f..79a788038 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -44,6 +44,8 @@ from build_scripts.utils import run_instruction from build_scripts.utils import rmtree from build_scripts.utils import get_ci_qmake_path import os +import site +import sys # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -65,7 +67,7 @@ def call_testrunner(python_ver, buildnro): _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH) rmtree(_env, True) # Pinning the virtualenv before creating one - run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv") + run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv") run_instruction(["virtualenv", "-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 |