[Compass-ci] Re: [PATCH v4 lkp-tests] feat(iso2rootfs): add step: submit rootfs test job after rootfs is made

On Thu, Oct 22, 2020 at 05:49:43PM +0800, Yu Chuan wrote:

[Why] The produced dailybuild rootfs needs further testing by submit a job.

[How]

1. Configure lkp env by {LKP_SRC}/sbin/install-dependencies.sh

2. Generate global compass-ci yaml.

• The path of yaml:
  • /etc/compass-ci/defaults/sparrow.yaml
• The yaml have two necessary fields:
  • SCHED_HOST
  • SCHED_PORT
• The value of these two fields are consistent with the value in job.yaml of iso2rootfs.

3. Submit the job.yaml of rootfs test job with append follow params:

• os
• os_arch
• os_version
• os_mount
• testbox

Signed-off-by: Yu Chuan 13186087857@163.com

jobs/iso2rootfs.yaml | 6 ++++ tests/iso2rootfs | 76 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index f413c9cee1f0..644c64be06b4 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -11,3 +11,9 @@ iso2rootfs: rootfs_path: initrd_http_host: initrd_http_port:

• test_yaml:
• test_os:
• test_os_arch:
• test_os_version:
• test_os_mount:
• test_testbox:

diff --git a/tests/iso2rootfs b/tests/iso2rootfs index bf1f995e78df..e8a027b0dad2 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -53,12 +53,18 @@ 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 "var\(${yaml_t}\) is none"
  

• [ -n "$(eval echo "\$${yaml_t}")" ] || die "cannot fine value of var: ${yaml_t}."
  

  done

}

@@ -133,7 +139,7 @@ mount_rootfs() install_pkgs "cifs-utils" ;; *)

• 	die "rootfs_protocol is none, exit !!!"
  

• 	die "cannot support the rootfs_protocol: ${rootfs_protocol}."
  

  ;; esac

@@ -164,7 +170,7 @@ check_sha256sum_update()

if [ -n "$SHA256SUM_CACHE" ] then

• [ -n "$SHA256SUM_NET" ] || die "get net sha256sum failed !!!"
  

• [ -n "$SHA256SUM_NET" ] || die "cannot get sha256sum of dailybuild iso."
  
  

  if [ "$SHA256SUM_CACHE" == "$SHA256SUM_NET" ] then

@@ -185,7 +191,9 @@ check_os() { log_info "starting check os ..." echo "${ALLOW_OS[@]}" | grep -wq "${os}" ||

• die "current host \(${os}\) is not in \(${ALLOW_OS[@]}\), exit !!!"
  

• die "current os is not in allow os.
  

• 	current os: ${os}.
  

• 	allow os: \(${ALLOW_OS[@]}\)"
  

}

get_cgz() @@ -210,12 +218,12 @@ install_pkgs() local pkg_installer command -v yum && pkg_installer="yum"

• [[ -n "$pkg_installer" ]] || die "can not find pkg installer !!!"

• [[ -n "$pkg_installer" ]] || die "cannot find pkg installer."

  local pt for pt do

• "$pkg_installer" install -y "$pt" || die "install pkg\($pt\) failed !!!"
  

• "$pkg_installer" install -y "$pt" || die "cannot install pkg: $pt."
  

  done

}

@@ -364,7 +372,7 @@ test_rootfs() root_path="cifs:${ROOTFS_SERVER_PATH}/$(basename "${ROOTFS_DES_DIR}"),${ROOTFS_MOUNT_PARAM}" ;; *)

• 	die "rootfs_protocol is none, exit !!!"
  

• 	die "cannot support the rootfs_protocol: ${rootfs_protocol}."
  

  ;; esac get_qemu_efi_fd

@@ -404,6 +412,57 @@ test_rootfs() EOF }

+############ submit test job yaml ############ +generate_global_yaml() +{

• local config_yaml="/etc/compass-ci/defaults/sparrow.yaml"
• mkdir -p "$(dirname "${config_yaml}")"
• echo "SCHED_HOST: ${SCHED_HOST}" >> "${config_yaml}"
• echo "SCHED_PORT: ${SCHED_PORT}" >> "${config_yaml}"

+}

+generate_submit_append_str()

Too long, suggest use generate_submit_append().

+{

• local wait_add_vars=(

• "os"
  

• "os_arch"
  

• "os_version"
  

• "os_mount"
  

• "testbox"
  

• )
• for vt in "${wait_add_vars[@]}"
• do

• SUBMIT_APPEND_STR="${SUBMIT_APPEND_STR} ${vt}=$(eval echo "\$test_${vt}")"
  

• done

+}

+submit_test_job_yaml()

ditto, suggest submit_test_yaml(), just like you use "${test_yaml}" below

Thanks, Xijian

+{

• log_info "starting submit ${test_yaml} ..."
• [ -d "${LKP_SRC}" ] || die "cannot find value of var: LKP_SRC."
• cd "${LKP_SRC}" && {

• chmod +x ./sbin/install-dependencies.sh
  

• ./sbin/install-dependencies.sh
  

• generate_global_yaml
  

• }
• cd "${LKP_SRC}/jobs" && {

• [ -f "${test_yaml}" ] ||
  

• 	die "cannot find test yaml in LKP_SRC/jobs.
  

• 		test yaml: ${test_yaml}."
  

• generate_submit_append_str
  

• "${LKP_SRC}/sbin/submit" ${SUBMIT_APPEND_STR} "${test_yaml}"
  

• }
• log_info "submit ${test_yaml} finished"

+}