aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2021-07-14 08:53:11 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2021-07-14 08:53:11 +0800
commit977c0562c3a56425b12302a4d373ad67f1462cad (patch)
treeb81772d75fc6aa956a5967ede13369dc52052544
parent5a03b072356522419975827017ca89101063ce44 (diff)
submit_for_testing-v2.sh: fix the project_name incorrect problem
it should use the project slug as default, instead of the global project name Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I607ca943794c43b2bd38c08c6545f75499023384
-rwxr-xr-xlkft/lava-job-definitions/submit_for_testing-v2.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/lkft/lava-job-definitions/submit_for_testing-v2.sh b/lkft/lava-job-definitions/submit_for_testing-v2.sh
index 88c7238baa..70133b3486 100755
--- a/lkft/lava-job-definitions/submit_for_testing-v2.sh
+++ b/lkft/lava-job-definitions/submit_for_testing-v2.sh
@@ -426,16 +426,13 @@ function submit_jobs_for_config(){
qa_server_team="${TEST_QA_SERVER_TEAM}"
fi
qa_server_project=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_${plan}" "${build_config}")
- if [ -z "${qa_server_project}" ]; then
- qa_server_project="${TEST_QA_SERVER_PROJECT}"
- fi
+ [ -z "${qa_server_project}" ] && qa_server_project="${TEST_QA_SERVER_PROJECT}"
+ qa_server_project_name=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_NAME_${plan}" "${build_config}")
+ [ -z "${qa_server_project_name}" ] && qa_server_project_name="${qa_server_project}"
qa_server_project_private=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_PRIVATE_${plan}" "${build_config}")
[ -z "${qa_server_project_private}" ] && qa_server_project_private="${TEST_QA_SERVER_PROJECT_PRIVATE}"
- qa_server_project_name=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_NAME_${plan}" "${build_config}")
- [ -z "${qa_server_project_name}" ] && qa_server_project_name="${TEST_QA_SERVER_PROJECT_NAME}"
-
lava_job_priority=$(get_value_from_config_file "TEST_LAVA_JOB_PRIORITY_${plan}" "${build_config}")
if [ -n "${lava_job_priority}" ]; then
TEST_LAVA_JOB_PRIORITY="${lava_job_priority}"