[Why] In some cases, we do not need to configure the result rootfs, so add a switch to configure rootfs.
Signed-off-by: Yu Chuan 13186087857@163.com --- jobs/iso2rootfs.yaml | 2 ++ tests/iso2rootfs | 1 + 2 files changed, 3 insertions(+)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 4e8729997a00..c81d548b49ea 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -13,6 +13,8 @@ iso2rootfs:
# dailybuild related fields iso_url_file: + ## 0 - config; 1- don't config + config_rootfs:
# submit test yaml related fields test_yaml: diff --git a/tests/iso2rootfs b/tests/iso2rootfs index d42c38909f68..34c8e84d9d74 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -355,6 +355,7 @@ disable_selinux()
config_rootfs() { + [ "${config_rootfs}" == "0" ] || return 0 config_dns_resolver disable_selinux }
On Thu, Nov 19, 2020 at 08:47:15AM +0800, Yu Chuan wrote:
[Why] In some cases, we do not need to configure the result rootfs, so add a switch to configure rootfs.
Signed-off-by: Yu Chuan 13186087857@163.com
jobs/iso2rootfs.yaml | 2 ++ tests/iso2rootfs | 1 + 2 files changed, 3 insertions(+)
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 4e8729997a00..c81d548b49ea 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -13,6 +13,8 @@ iso2rootfs:
# dailybuild related fields iso_url_file:
## 0 - config; 1- don't config
config_rootfs:
# submit test yaml related fields test_yaml:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index d42c38909f68..34c8e84d9d74 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -355,6 +355,7 @@ disable_selinux()
config_rootfs() {
- [ "${config_rootfs}" == "0" ] || return 0
^^ is there need string "0" ?
Thanks, Baijing
config_dns_resolver disable_selinux } -- 2.23.0
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 4e8729997a00..c81d548b49ea 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -13,6 +13,8 @@ iso2rootfs:
# dailybuild related fields iso_url_file:
## 0 - config; 1- don't config
config_rootfs:
# submit test yaml related fields test_yaml:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index d42c38909f68..34c8e84d9d74 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -355,6 +355,7 @@ disable_selinux()
config_rootfs() {
- [ "${config_rootfs}" == "0" ] || return 0
^^ is there need string "0" ?
yes, you're right, this is surely a good point.
because of we can't limit the user's input content of job.yaml, so use string instead of integer here. :)
-------- Thanks Yu Chuan
Thanks, Baijingconfig_dns_resolver disable_selinux } -- 2.23.0
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 4e8729997a00..c81d548b49ea 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -13,6 +13,8 @@ iso2rootfs:
# dailybuild related fields iso_url_file:
- ## 0 - config; 1- don't config
please add comment about what do you configure?
Btw, you can use the follow fields in job.yaml: # config rootfs relate fields ## comment about supportted fields. ## dns - will config /etc/resolv.conf. ## no_selinux - will disable selinux in /etc/selinux/config config_rootfs: dns, no_selinux, ...
Thanks, Shenwei
config_rootfs:
# submit test yaml related fields test_yaml:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index d42c38909f68..34c8e84d9d74 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -355,6 +355,7 @@ disable_selinux()
config_rootfs() {
- [ "${config_rootfs}" == "0" ] || return 0 config_dns_resolver disable_selinux
}
2.23.0
On Thu, Nov 19, 2020 at 10:08:04AM +0800, Xiao Shenwei wrote:
diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 4e8729997a00..c81d548b49ea 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -13,6 +13,8 @@ iso2rootfs:
# dailybuild related fields iso_url_file:
- ## 0 - config; 1- don't config
please add comment about what do you configure?
ok.
Btw, you can use the follow fields in job.yaml: # config rootfs relate fields ## comment about supportted fields. ## dns - will config /etc/resolv.conf. ## no_selinux - will disable selinux in /etc/selinux/config config_rootfs: dns, no_selinux, ...
Good point !
-------- Thanks Yu Chuan
Thanks, Shenwei
config_rootfs:
# submit test yaml related fields test_yaml:
diff --git a/tests/iso2rootfs b/tests/iso2rootfs index d42c38909f68..34c8e84d9d74 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -355,6 +355,7 @@ disable_selinux()
config_rootfs() {
- [ "${config_rootfs}" == "0" ] || return 0 config_dns_resolver disable_selinux
}
2.23.0
-
Bai Jing -
Xiao Shenwei -
Yu Chuan