[Why] We can only generate the rootfs of dailybuild, so decouple the code related to dailybuild.
[How] Use 'iso_url_file' as a switch. - If this field is specified, so generate the rootfs of dailybuild; - If not, generate the rootfs of the official iso of the target version.
Signed-off-by: Yu Chuan 13186087857@163.com --- jobs/iso2rootfs.yaml | 4 +++- tests/iso2rootfs | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index d4f0ffc0e80c..4e8729997a00 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -2,7 +2,6 @@ suite: iso2rootfs category: benchmark iso2rootfs: iso2rootfs_cgz: - iso_url_file: iso_os: iso_arch: iso_version: @@ -12,6 +11,9 @@ iso2rootfs: initrd_http_host: initrd_http_port:
+ # dailybuild related fields + iso_url_file: + # submit test yaml related fields test_yaml: test_os: diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 9c71b8427d90..d42c38909f68 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -44,7 +44,6 @@ check_yaml_vars() "os_arch" "os_version" "iso2rootfs_cgz" - "iso_url_file" "iso_os" "iso_arch" "iso_version" @@ -149,8 +148,6 @@ mount_rootfs()
get_cache_iso_checksum() { - mount_rootfs - CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-latest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE") @@ -243,7 +240,10 @@ config_iso2rootfs() pre_works() { check_yaml_vars - check_sha256sum_update + + mount_rootfs + [ -n "${iso_url_file}" ] && check_sha256sum_update + check_os
config_iso2rootfs @@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf - config_iso_url + [ -n "${iso_url_file}" ] && config_iso_url }
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..." - local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2" + local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}" @@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}" + [ -n "${iso_url_file}" ] && { + mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild" - cd "${ROOTFS_LOCAL_PATH}" && - rm -f "${soft_link}" && - ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}" + local soft_link="${iso_version}-dailybuild" + cd "${ROOTFS_LOCAL_PATH}" && + rm -f "${soft_link}" && + ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}" + }
cd / && umount "${ROOTFS_LOCAL_PATH}"
On Thu, Nov 19, 2020 at 08:47:14AM +0800, Yu Chuan wrote:
[Why] We can only generate the rootfs of dailybuild, so decouple the code related to dailybuild.
looks your patch is about the follow function:
[Why] The 'iso_url_file' field is only relate to the dailybuild function, and this field is unnecessary when user only want generate a rootfs from offical distribution.
But now if this field is none, this job will failed.
So decouple the code related to dailybuild.
[Addition] if the `iso_url_file` field exists, this job will generate a soft link which point to the result rootfs.
soft link name: {iso_version}-dailybuild.
get_cache_iso_checksum() {
- mount_rootfs
- CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-latest.sha256sum"
[ ! -f "${CHECKSUM_FILE_CACHE}" ] ||
why it seems so strange?
Thanks, Shenwei
SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE")@@ -243,7 +240,10 @@ config_iso2rootfs() pre_works() { check_yaml_vars
- check_sha256sum_update
mount_rootfs
[ -n "${iso_url_file}" ] && check_sha256sum_update
check_os
config_iso2rootfs
@@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf
- config_iso_url
- [ -n "${iso_url_file}" ] && config_iso_url
}
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..."
- local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2"
local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}"
@@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- [ -n "${iso_url_file}" ] && {
mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild"
- cd "${ROOTFS_LOCAL_PATH}" &&
rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
local soft_link="${iso_version}-dailybuild"cd "${ROOTFS_LOCAL_PATH}" &&rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"}
cd / && umount "${ROOTFS_LOCAL_PATH}"
-- 2.23.0
On Thu, Nov 19, 2020 at 09:54:59AM +0800, Xiao Shenwei wrote:
On Thu, Nov 19, 2020 at 08:47:14AM +0800, Yu Chuan wrote:
[Why] We can only generate the rootfs of dailybuild, so decouple the code related to dailybuild.
looks your patch is about the follow function:
[Why] The 'iso_url_file' field is only relate to the dailybuild function, and this field is unnecessary when user only want generate a rootfs from offical distribution.
But now if this field is none, this job will failed.
So decouple the code related to dailybuild.
[Addition] if the `iso_url_file` field exists, this job will generate a soft link which point to the result rootfs.
soft link name: {iso_version}-dailybuild.
Good !!
get_cache_iso_checksum() {
- mount_rootfs
- CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-latest.sha256sum"
[ ! -f "${CHECKSUM_FILE_CACHE}" ] ||
why it seems so strange?
Good point. this is the previous code, i'll modify here. :)
-------- Thanks Yu Chuan
Thanks, Shenwei
SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE")@@ -243,7 +240,10 @@ config_iso2rootfs() pre_works() { check_yaml_vars
- check_sha256sum_update
mount_rootfs
[ -n "${iso_url_file}" ] && check_sha256sum_update
check_os
config_iso2rootfs
@@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf
- config_iso_url
- [ -n "${iso_url_file}" ] && config_iso_url
}
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..."
- local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2"
local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}"
@@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- [ -n "${iso_url_file}" ] && {
mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild"
- cd "${ROOTFS_LOCAL_PATH}" &&
rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
local soft_link="${iso_version}-dailybuild"cd "${ROOTFS_LOCAL_PATH}" &&rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"}
cd / && umount "${ROOTFS_LOCAL_PATH}"
-- 2.23.0
On Thu, Nov 19, 2020 at 08:47:14AM +0800, Yu Chuan wrote:
[Why] We can only generate the rootfs of dailybuild, so decouple the code related to dailybuild.
[How] Use 'iso_url_file' as a switch.
- If this field is specified, so generate the rootfs of dailybuild;
- If not, generate the rootfs of the official iso of the target version.
Signed-off-by: Yu Chuan 13186087857@163.com
jobs/iso2rootfs.yaml | 4 +++- tests/iso2rootfs | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index d4f0ffc0e80c..4e8729997a00 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -2,7 +2,6 @@ suite: iso2rootfs category: benchmark iso2rootfs: iso2rootfs_cgz:
- iso_url_file: iso_os: iso_arch: iso_version:
@@ -12,6 +11,9 @@ iso2rootfs: initrd_http_host: initrd_http_port:
- # dailybuild related fields
- iso_url_file:
- # submit test yaml related fields test_yaml: test_os:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 9c71b8427d90..d42c38909f68 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -44,7 +44,6 @@ check_yaml_vars() "os_arch" "os_version" "iso2rootfs_cgz"
"iso_url_file"@@ -149,8 +148,6 @@ mount_rootfs()
get_cache_iso_checksum() {
- mount_rootfs
- CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-latest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE")
@@ -243,7 +240,10 @@ config_iso2rootfs() pre_works() { check_yaml_vars
- check_sha256sum_update
- mount_rootfs
- [ -n "${iso_url_file}" ] && check_sha256sum_update
Here iso_url_file is not obviously related to dailybuild scene, so can: iso_url_file => dailybuild_iso_url_file
Thanks, Xijian
On Thu, Nov 19, 2020 at 08:47:14AM +0800, Yu Chuan wrote:
[Why] We can only generate the rootfs of dailybuild, so decouple the code related to dailybuild.
[How] Use 'iso_url_file' as a switch.
- If this field is specified, so generate the rootfs of dailybuild;
- If not, generate the rootfs of the official iso of the target version.
Signed-off-by: Yu Chuan 13186087857@163.com
jobs/iso2rootfs.yaml | 4 +++- tests/iso2rootfs | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index d4f0ffc0e80c..4e8729997a00 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -2,7 +2,6 @@ suite: iso2rootfs category: benchmark iso2rootfs: iso2rootfs_cgz:
- iso_url_file: iso_os: iso_arch: iso_version:
@@ -12,6 +11,9 @@ iso2rootfs: initrd_http_host: initrd_http_port:
- # dailybuild related fields
- iso_url_file:
- # submit test yaml related fields test_yaml: test_os:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 9c71b8427d90..d42c38909f68 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -44,7 +44,6 @@ check_yaml_vars() "os_arch" "os_version" "iso2rootfs_cgz"
"iso_url_file"@@ -149,8 +148,6 @@ mount_rootfs()
get_cache_iso_checksum() {
- mount_rootfs
- CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-latest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE")
@@ -243,7 +240,10 @@ config_iso2rootfs() pre_works() { check_yaml_vars
- check_sha256sum_update
mount_rootfs
[ -n "${iso_url_file}" ] && check_sha256sum_update
check_os
config_iso2rootfs
@@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf
- config_iso_url
- [ -n "${iso_url_file}" ] && config_iso_url
How about check this in the config_iso_url?
Thanks, Xueliang
}
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..."
- local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2"
local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}"
@@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- [ -n "${iso_url_file}" ] && {
mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild"
- cd "${ROOTFS_LOCAL_PATH}" &&
rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
local soft_link="${iso_version}-dailybuild"cd "${ROOTFS_LOCAL_PATH}" &&rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"}
cd / && umount "${ROOTFS_LOCAL_PATH}"
-- 2.23.0
@@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf
- config_iso_url
- [ -n "${iso_url_file}" ] && config_iso_url
How about check this in the config_iso_url?
Good point!
-------- Thanks Yu Chuan
Thanks, Xueliang
}
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..."
- local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2"
local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}"
@@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- [ -n "${iso_url_file}" ] && {
mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild"
- cd "${ROOTFS_LOCAL_PATH}" &&
rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
local soft_link="${iso_version}-dailybuild"cd "${ROOTFS_LOCAL_PATH}" &&rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"}
cd / && umount "${ROOTFS_LOCAL_PATH}"
-- 2.23.0
On Thu, Nov 19, 2020 at 08:47:14AM +0800, Yu Chuan wrote:
[Why] We can only generate the rootfs of dailybuild, so decouple the code related to dailybuild.
[How] Use 'iso_url_file' as a switch.
- If this field is specified, so generate the rootfs of dailybuild;
- If not, generate the rootfs of the official iso of the target version.
Signed-off-by: Yu Chuan 13186087857@163.com
jobs/iso2rootfs.yaml | 4 +++- tests/iso2rootfs | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index d4f0ffc0e80c..4e8729997a00 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -2,7 +2,6 @@ suite: iso2rootfs category: benchmark iso2rootfs: iso2rootfs_cgz:
- iso_url_file: iso_os: iso_arch: iso_version:
@@ -12,6 +11,9 @@ iso2rootfs: initrd_http_host: initrd_http_port:
- # dailybuild related fields
- iso_url_file:
- # submit test yaml related fields test_yaml: test_os:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 9c71b8427d90..d42c38909f68 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -44,7 +44,6 @@ check_yaml_vars() "os_arch" "os_version" "iso2rootfs_cgz"
"iso_url_file"@@ -149,8 +148,6 @@ mount_rootfs()
get_cache_iso_checksum() {
- mount_rootfs
- CHECKSUM_FILE_CACHE="${ROOTFS_LOCAL_PATH}/${iso_version}-latest.sha256sum" [ ! -f "${CHECKSUM_FILE_CACHE}" ] || SHA256SUM_CACHE=$(awk '{print $1}' "$CHECKSUM_FILE_CACHE")
@@ -243,7 +240,10 @@ config_iso2rootfs() pre_works() { check_yaml_vars
- check_sha256sum_update
mount_rootfs
[ -n "${iso_url_file}" ] && check_sha256sum_update
check_os
config_iso2rootfs
@@ -286,7 +286,7 @@ config_iso2qcow2()
config_pip_proxy config_iso_conf
- config_iso_url
- [ -n "${iso_url_file}" ] && config_iso_url
}
run_iso2qcow2() @@ -332,7 +332,7 @@ config_qcow2rootfs() run_qcow2rootfs() { log_info "starting run qcow2rootfs ..."
- local qcow2_path="${I2Q_SRC}/output/${ISO_NAME%.iso}.qcow2"
local qcow2_path="$(ls ${I2Q_SRC}/output/*.qcow2)"
cd "${CCI_SRC}/container/qcow2rootfs" ./run "${qcow2_path}" "${ROOTFS_DES_DIR}"
@@ -501,12 +501,14 @@ post_works() { log_info "starting post works ..."
- mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- [ -n "${iso_url_file}" ] && {
mv "${CHECKSUM_FILE_CACHE}.tmp" "${CHECKSUM_FILE_CACHE}"
- local soft_link="${iso_version}-dailybuild"
- cd "${ROOTFS_LOCAL_PATH}" &&
rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
local soft_link="${iso_version}-dailybuild"cd "${ROOTFS_LOCAL_PATH}" &&rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
Here can use to replace "rm -f" + "ln -s" ln -sfT "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
Thanks, Xijian
- local soft_link="${iso_version}-dailybuild"
- cd "${ROOTFS_LOCAL_PATH}" &&
rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
local soft_link="${iso_version}-dailybuild"cd "${ROOTFS_LOCAL_PATH}" &&rm -f "${soft_link}" &&ln -s "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"Here can use to replace "rm -f" + "ln -s" ln -sfT "$(basename "${ROOTFS_DES_DIR}")" "${soft_link}"
Good point!
-------- Thanks Yu Chuan
Thanks, Xijian
-
Cao Xueliang -
Xiao Shenwei -
Xu Xijian -
Yu Chuan