diff options
| author | Simo Fält <simo.falt@qt.io> | 2019-11-18 09:26:27 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2019-11-20 12:19:47 +0200 |
| commit | 2cfb016e28e0403f06b42f90c21dcfabe6b19db9 (patch) | |
| tree | e97b2623472986769ebbc0563fcb517c6d45cc40 /coin_build_instructions.py | |
| parent | 6564925be8c6875f300d0013726a52337f23ca17 (diff) | |
Brute solution for skipping missing ci template
There is a problem with Ubuntu 18.04 provisioning in
Qt5#5.12.6 branch, so we can't use that target. In
order to be able to skip that, we have to use CI's
custom module class instead of pyside class to get
pass the blocker. This commit is only to be used in
release branch, while it disables LicenceCheck target.
Change-Id: I5530d4ae19584685bbec034d0b8b977f25082ba2
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 9a7d6272c..1ffc97554 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -44,9 +44,10 @@ from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree from build_scripts.utils import get_python_dict -from build_scripts.utils import acceptCITestConfiguration from build_scripts.utils import get_ci_qmake_path import os +import datetime +import calendar # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -57,7 +58,8 @@ CI_HOST_OS_VER = option_value("osVer") CI_ENV_INSTALL_DIR = option_value("instdir") CI_ENV_AGENT_DIR = option_value("agentdir") CI_COMPILER = option_value("compiler") -CI_INTEGRATION_ID = option_value("coinIntegrationId") +CI_INTEGRATION_ID = option_value("coinIntegrationId") or \ + str(calendar.timegm(datetime.datetime.now().timetuple())) CI_FEATURES = [] _ci_features = option_value("features") if _ci_features is not None: @@ -132,8 +134,6 @@ def call_setup(python_ver): run_instruction(cmd, "Failed to run setup.py", initial_env=env) def run_build_instructions(): - if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): - exit() # Remove some environment variables that impact cmake for env_var in ['CC', 'CXX']: |