diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2019-06-17 20:04:21 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2019-06-19 00:52:41 +0000 |
| commit | d37c5619c20633f850680683a012ee6670df6c03 (patch) | |
| tree | 25531f689000904b70d9516a192e9dd118493cca /lkft | |
| parent | cad55ac2107f15182b6374ea05cad828c2102abc (diff) | |
lkft android: enable to specify qa-server environment
for builds following,
lkft-hikey-android-9.0-4.19.yaml
lkft-hikey-aosp-4.14-premerge-ci.yaml
lkft-hikey-aosp-4.9-premerge-ci.yaml
as they use the existing qa-report projects,
need to keep using the old environment name for
the hikey builds result.
For other builds, as TEST_QA_SERVER_ENVIRONMENT_ENABLED
is not set, so they will continue to use the device_type
as qa-report server environment
Change-Id: Ic36859f13754a758abbf4edc49fc678baddc67f4
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Diffstat (limited to 'lkft')
| -rwxr-xr-x | lkft/lava-job-definitions/common/submit_for_testing-v2.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh index d20cf80e..c3f6b716 100755 --- a/lkft/lava-job-definitions/common/submit_for_testing-v2.sh +++ b/lkft/lava-job-definitions/common/submit_for_testing-v2.sh @@ -59,9 +59,14 @@ function submit_jobs_for_config(){ # replace file name in job template with new file name generated sed -i "s|{{DOWNLOAD_URL}}/${f}|{{DOWNLOAD_URL}}/${build_config}-$f|" ${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/common/devices/${TEST_DEVICE_TYPE} done - OPT_ENV_SUFFIX="" - if [ -z "{TEST_QA_SERVER_ENV_SUFFIX}" ] && [ "X${TEST_QA_SERVER_ENV_SUFFIX_ENABLED}" == "Xtrue" ]; then - OPT_ENV_SUFFIX="--env-suffix ${TEST_QA_SERVER_ENV_SUFFIX}" + + # set OPT_ENVIRONMENT to empty by default, to make openembedded-lkft/submit_for_testing.py + # use the device type as the qa-report server environment + # and use the value of TEST_QA_SERVER_ENVIRONMENT as the qa-report server environment + # if it is sepecified explicitly + OPT_ENVIRONMENT="" + if [ -n "${TEST_QA_SERVER_ENVIRONMENT}" ] && [ "X${TEST_QA_SERVER_ENVIRONMENT_ENABLED}" == "Xtrue" ]; then + OPT_ENVIRONMENT="--environment ${TEST_QA_SERVER_ENVIRONMENT}" fi python ${DIR_CONFIGS_ROOT}/openembedded-lkft/submit_for_testing.py \ --device-type ${TEST_DEVICE_TYPE} \ @@ -69,7 +74,7 @@ function submit_jobs_for_config(){ --lava-server ${TEST_LAVA_SERVER} \ --qa-server ${TEST_QA_SERVER} \ --qa-server-team android-lkft \ - ${OPT_ENV_SUFFIX} \ + ${OPT_ENVIRONMENT} \ --qa-server-project ${TEST_QA_SERVER_PROJECT} \ --git-commit ${QA_BUILD_VERSION} \ --testplan-path ${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/common \ |