diff options
| author | luwenpeng <[email protected]> | 2023-06-12 20:26:25 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2023-06-13 11:40:17 +0800 |
| commit | 3bd11e4d657e98b58ab129bd019aea78076c9b29 (patch) | |
| tree | d059eecc6574101e61215e405872355cc5bba3a1 | |
| parent | f30015805df4068d7f3697bd0ef98db5f514a9d5 (diff) | |
修改CI编译条件 & 更新 onie-netcfg-set 脚本HEADv2.0.7-20230613dev-23.06
* 增加注释信息
* 避免grubenv原始数据没有换行符造成onie_network_option配置无法识别
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rwxr-xr-x | rootconf/default/bin/onie-netcfg-set | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6275e499..f2a3414e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,9 @@ release-TSG-7400-ONIE: paths: - ${CI_PROJECT_DIR}/*.tar.gz only: - - tags - except: - /^rel-.*$/i + - /^dev-.*$/i + - tags release-TSG-9140-ONIE: stage: build @@ -55,9 +55,9 @@ release-TSG-9140-ONIE: paths: - ${CI_PROJECT_DIR}/*.tar.gz only: - - tags - except: - /^rel-.*$/i + - /^dev-.*$/i + - tags release-TSG-X_NXR620G40_R01: stage: build @@ -73,6 +73,6 @@ release-TSG-X_NXR620G40_R01: paths: - ${CI_PROJECT_DIR}/*.tar.gz only: - - tags - except: - - /^rel-.*$/i
\ No newline at end of file + - /^rel-.*$/i + - /^dev-.*$/i + - tags
\ No newline at end of file diff --git a/rootconf/default/bin/onie-netcfg-set b/rootconf/default/bin/onie-netcfg-set index ab8999af..263106b8 100755 --- a/rootconf/default/bin/onie-netcfg-set +++ b/rootconf/default/bin/onie-netcfg-set @@ -202,6 +202,8 @@ bond="bond" option=$1 +echo "# Automatically generated onie_network_option_xxx; DO NOT EDIT" >>/mnt/onie-boot/grub/grubenv + if [ "$option" = "$clear" ]; then clear_config $1 $2 $3 ret=$? |