[Why] If user only want generate a rootfs without testing it, he can not write submit related fields in the job.yaml.
Signed-off-by: Yu Chuan 13186087857@163.com --- jobs/iso2rootfs.yaml | 2 ++ tests/iso2rootfs | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 644c64be06b4..d4f0ffc0e80c 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -11,6 +11,8 @@ iso2rootfs: rootfs_path: initrd_http_host: initrd_http_port: + + # submit test yaml related fields test_yaml: test_os: test_os_arch: diff --git a/tests/iso2rootfs b/tests/iso2rootfs index e8a027b0dad2..4f7843d7f348 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -53,15 +53,8 @@ check_yaml_vars() "rootfs_path" "initrd_http_host" "initrd_http_port" - "test_yaml" - "test_os" - "test_os_arch" - "test_os_version" - "test_os_mount" - "test_testbox" )
- local yaml_t for yaml_t in "${yaml_vars[@]}" do [ -n "$(eval echo "$${yaml_t}")" ] || die "cannot fine value of var: ${yaml_t}." @@ -439,10 +432,25 @@ generate_submit_append_str()
submit_test_job_yaml() { + [ -n ${test_yaml} ] || return 0 + log_info "starting submit ${test_yaml} ..."
[ -d "${LKP_SRC}" ] || die "cannot find value of var: LKP_SRC."
+ local test_yaml_vars=( + "test_os" + "test_os_arch" + "test_os_version" + "test_os_mount" + "test_testbox" + ) + + for yaml_t in "${test_yaml_vars[@]}" + do + [ -n "$(eval echo "$${yaml_t}")" ] || die "cannot fine value of var: ${yaml_t}." + done + cd "${LKP_SRC}" && { chmod +x ./sbin/install-dependencies.sh ./sbin/install-dependencies.sh
-
Yu Chuan