diff --git a/README.en.md b/README.en.md index 13fefab559f2e07640ddd0f0b07f7a5e10103701..7edafcdf2acd3138c8467d8905336db84c6b33af 100644 --- a/README.en.md +++ b/README.en.md @@ -43,7 +43,7 @@ sudo chmod +x /usr/local/bin/nosa | --- | --- | | nosa init | Initialize the build working directory and pull the build configuration | | nosa fetch | Update the latest build configuration and download the required rpm package for caching | -| nosa build | Building a new commit of the OSTree file system | +| nosa build | Building a new commit of the OSTree file system, generate ociarchive file | #### Build manage | Command | Description | @@ -73,7 +73,6 @@ sudo chmod +x /usr/local/bin/nosa | nosa kola-run | Equivalent to `kola run`, this command can eliminate interference from invalid logs during the testing process, obtain test statistics results, and extract valid logs| | nosa push-container | Push OCI format OSTree to registry | | nosa run | Run the NestOS qemu instance of the specified build, usually used for debugging and validation | -| nosa runc | Run the command using the NestOS container image of the specified build, default to bash, usually used for debugging and validation | | nosa shell | Enter the `nestos-assembler` container image environment bash, usually used for debugging and verification | ### LICENSE diff --git a/README.md b/README.md index 135ab0f8659adc829916f29d7caaa5b014bbec2e..cea20d3359c861b35ca8023492decf45ecf7b4e5 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ sudo chmod +x /usr/local/bin/nosa | 命令 | 描述 | | --- | --- | | nosa init | 初始化构建工作目录,拉取构建配置 | -| nosa fetch | 更新最新构建配置,下载缓存所需rpm包 | -| nosa build | 构建新版ostree文件系统 | +| nosa fetch | 更新最新构建配置,下载并缓存所需rpm包 | +| nosa build | 构建新版本ostree文件系统,生成OCI格式归档文件 | #### 构建管理 | 命令 | 描述 | @@ -72,7 +72,6 @@ sudo chmod +x /usr/local/bin/nosa | nosa kola-run | 等效于`kola run`,通过此命令可排除测试过程无效日志干扰,获取测试统计结果及有效日志摘录| | nosa push-container | 推送OCI格式ostree文件系统至容器镜像仓库 | | nosa run | 运行指定构建版本的NestOS qemu实例,一般用于调试验证 | -| nosa runc | 以指定构建版本的NestOS 容器镜像运行命令,默认为bash,一般用于调试验证 | | nosa shell | 进入nestos-assembler容器镜像环境bash,一般用于调试验证 | ### LICENSE diff --git a/cmd/coreos-assembler.go b/cmd/coreos-assembler.go index 69d2a26471321f3d37d567479bdfe49ce6cf422a..bbf3ffd7819c2795272ed4b60bb1c8e4e8c569e4 100644 --- a/cmd/coreos-assembler.go +++ b/cmd/coreos-assembler.go @@ -13,15 +13,15 @@ import ( // commands we'd expect to use in the local dev path var buildCommands = []string{"init", "fetch", "build", "run", "prune", "clean", "list"} -var advancedBuildCommands = []string{"push-container", "upload-oscontainer"} +var advancedBuildCommands = []string{"push-container"} var buildextendCommands = []string{"extensions", "extensions-container", "legacy-oscontainer", "live", "metal", "metal4k", "openstack", "qemu", "secex"} -var utilityCommands = []string{"compress", "copy-container", "kola", "push-container-manifest", "remote-build-container", "remote-prune", "remote-session", "tag", "virt-install"} +var utilityCommands = []string{"compress", "copy-container", "kola", "push-container-manifest", "remote-build-container", "remote-session", "tag", "virt-install"} var otherCommands = []string{"shell", "meta"} -var nestos_unsupport_advanced_build_commands = []string{"buildfetch", "buildupload", "oc-adm-release"} -var nestos_unsupport_buildextend_commands = []string{"aliyun", "applehv", "aws", "azure", "digitalocean", "exoscale", "gcp", "hashlist-experimental", "hyperv", "ibmcloud", "kubevirt", "nutanix", "virtualbox", "vmware", "vultr"} -var nestos_unsupport_utility_commands = []string{"aws-replicate", "koji-upload", "sign", "update-variant"} +var nestos_unsupport_advanced_build_commands = []string{"buildfetch", "buildupload", "buildinitramfs-fast", "oc-adm-release", "upload-oscontainer"} +var nestos_unsupport_buildextend_commands = []string{"aliyun", "applehv", "aws", "azure", "azurestack", "dasd", "digitalocean", "exoscale", "gcp", "hyperv", "ibmcloud", "kubevirt", "nutanix", "powervs", "virtualbox", "vmware", "vultr"} +var nestos_unsupport_utility_commands = []string{"aliyun-replicate", "aws-replicate", "dev-overlay", "dev-synthesize-osupdate", "dev-synthesize-osupdatecontainer", "koji-upload", "powervs-replicate", "remote-prune", "sign", "update-variant"} func init() { // Note buildCommands is intentionally listed in frequency order diff --git a/docs/changelog-compared-with-upstream.md b/docs/changelog-compared-with-upstream.md index 09a90e630836ece9c2a353d548fee20b62229584..7dea2d7d7d97f26f72792456884843c2577cc04f 100644 --- a/docs/changelog-compared-with-upstream.md +++ b/docs/changelog-compared-with-upstream.md @@ -1,11 +1,15 @@ # 对比上游项目主要改动 +## 支持架构变化 +当前NestOS仅支持x86_64与aarch64两种架构 + ## 功能接口变化 ### `nestos-assembler`不支持下列命令: - nosa aliyun-replicate - nosa aws-replicate - nosa buildextend-aliyun +- nosa buildextend-applehv - nosa buildextend-aws - nosa buildextend-azure - nosa buildextend-azurestack @@ -13,9 +17,12 @@ - nosa buildextend-digitalocean - nosa buildextend-exoscale - nosa buildextend-gcp +- nosa buildextend-hyperv - nosa buildextend-ibmcloud +- nosa buildextend-kubevirt - nosa buildextend-nutanix - nosa buildextend-powervs +- nosa buildextend-virtualbox - nosa buildextend-vmware - nosa buildextend-vultr - nosa buildfetch @@ -24,12 +31,12 @@ - nosa dev-overlay - nosa dev-synthesize-osupdate - nosa dev-synthesize-osupdatecontainer -- nosa generate-hashlist - nosa koji-upload - nosa oc-adm-release +- nosa powervs-replicate - nosa remote-prune - nosa sign -- nosa test-coreos-installer +- nosa update-variant - nosa upload-oscontainer ### `nestos-assembler`添加下列命令: @@ -41,14 +48,18 @@ #### 默认构建base镜像及软件源修改为openEuler #### 新增iSula容器引擎测试用例 #### push-container命令增强 -支持添加“--insecure”参数,忽略目标镜像仓库的SSL/TLS验证 +- 支持添加`--no-tls-verify`参数,忽略目标镜像仓库的SSL/TLS验证 +- 支持添加`-d`或`--dest-repository`参数,通过参数指定推送目标容器镜像仓库 +- 支持添加`--transport`参数,指定推送容器镜像传输方式,可通过此方式推送到本地容器引擎 +#### 修复以tcg方式构建live镜像失败问题 +#### 屏蔽不支持的kola选项 +#### 暂不支持以osbuild方式构建磁盘镜像 ## 目录结构变化 ### 移除与上游CICD相关代码目录及构建内容: - ci/ -- gangplank/ -- docs/gangplank/ +- continuous/ ### 修改和新增部分文档说明 diff --git a/src/cmd-test-coreos-installer b/src/cmd-test-nestos-installer similarity index 100% rename from src/cmd-test-coreos-installer rename to src/cmd-test-nestos-installer