On Fri, Apr 23, 2021 at 05:18:50PM +0800, Yu Chuan wrote:

1. change dailybuild result rootfs dir name

why:

• make the dailybuild rootfs directory more meaningful.

how:

• before: /srv/os/${iso_os}/${iso_arch}/${iso_version}-${TIMESTAMP}
• after : /srv/os/${iso_os}/${iso_arch}/${iso_version}-dailybuild-${TIMESTAMP}

2. change sha256sum file

why:

• unify the file name, then easier to statistics.

how:

• file name:
  • before: ${ROOTFS_DES_DIR}/${iso_version}-latest.sha256sum
  • after : ${ROOTFS_DES_DIR}/iso.sha256sum

^ better to use SHA256SUMS or other

• file content:
  • before: 168d2a8c24d20acdf06e67ffee90174b321b52e36afbddfc41602454feb2c09c openEuler-20.03-LTS-aarch64-dvd.iso

^ with iso_name is better for search...

Thanks, Dewan

- after : 168d2a8c24d20acdf06e67ffee90174b321b52e36afbddfc41602454feb2c09c

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

tests/iso2rootfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 06c8565110ab..e8694a73e807 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -318,6 +318,8 @@ download_compass_ci() config_rootfs_dir() { ROOTFS_DES_DIR=${ROOTFS_LOCAL_PATH}/${iso_version}-$(date "+%Y-%m-%d-%H-%M-%S")

• [ -n "${dailybuild_iso_url_file}" ] && ROOTFS_DES_DIR=${ROOTFS_LOCAL_PATH}/${iso_version}-dailybuild-$(date "+%Y-%m-%d-%H-%M-%S")
• [ -d "${ROOTFS_DES_DIR}" ] && ROOTFS_DES_DIR="${ROOTFS_DES_DIR}-${HOSTNAME##*--}" mkdir -p "$ROOTFS_DES_DIR"

@@ -592,7 +594,7 @@ update_dailybuild_soft_link() [ -n "${dailybuild_iso_url_file}" ] || return 0

mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"

• cp "${CHECKSUM_FILE_CACHE}" "${ROOTFS_DES_DIR}"

• echo $SHA256SUM_NET > "${ROOTFS_DES_DIR}/iso.sha256sum"

  local soft_link="${iso_version}-dailybuild" cd "${ROOTFS_LOCAL_PATH}" &&

-- 2.23.0