On Wed, Nov 25, 2020 at 07:13:24PM +0800, Yu Chuan wrote:
[Why] 'INITRD_HTTP_HOST' and 'INITRD_HTTP_PORT' should be added by the user on demand at runtime, no need to merge into the git repository.
Signed-off-by: Yu Chuan 13186087857@163.com
jobs/iso2rootfs.yaml | 2 -- tests/iso2rootfs | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 4f3e9c83e6cd..a0ffd280676d 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -7,8 +7,6 @@ iso2rootfs: rootfs_protocol: rootfs_server: rootfs_path:
initrd_http_host:
initrd_http_port:
# config rootfs related fields ## supported fields:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 761fbb8b70cf..4a19d42ddd94 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -49,8 +49,6 @@ check_yaml_vars() "rootfs_protocol" "rootfs_server" "rootfs_path"
"initrd_http_host""initrd_http_port")
for yaml_t in "${yaml_vars[@]}"
@@ -190,7 +188,8 @@ check_os()
get_cgz() {
blank line is necessary?
Thanks, Shenwei
- local cgz_url="http://$%7BINITRD_HTTP_HOST%7D:$%7BINITRD_HTTP_PORT%7D/initrd/pkg/nfs/$%7Bos..." local cgz_name cgz_name=$(basename "${cgz_url}") local cgz_path_t=${ENV_DIR}/${cgz_name}
-- 2.23.0