From 34ea42b60012777e35a9243105e110b39f0864ea Mon Sep 17 00:00:00 2001 From: daihw <928874202@qq.com> Date: Wed, 22 Sep 2021 18:08:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E7=9A=84=E4=BE=8B?= =?UTF-8?q?=E5=AD=90[https://e.gitee.com/99cloud/projects/284423/issues/li?= =?UTF-8?q?st=3Fissue=3DI4ASGW]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- guide/flow-dsl.md | 44 +++++++++++++++++++++++--------------------- guide/vars.md | 40 +++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/guide/flow-dsl.md b/guide/flow-dsl.md index 7828b9c..5e62b1e 100644 --- a/guide/flow-dsl.md +++ b/guide/flow-dsl.md @@ -18,8 +18,8 @@ workflow: 流程由节点组成,同一个流程中的节点名称不可重复: ``` - Mvn_Deploy: - type: maven:3-jdk11 + git_clone: + type: git_clone:1.0.0 ``` 节点使用type字段来指定节点类型,节点类型由类型唯一标识`ref`与类型版本组成 @@ -27,15 +27,15 @@ workflow: 如果不指定版本时,系统会使用默认版本`latest`,如 ``` - Mvn_Deploy: - type: maven + git_clone: + type: git_clone ``` 等价于 ``` - Mvn_Deploy: - type: maven:latest + git_clone: + type: git_clone:latest ``` ### 节点执行顺序 @@ -45,20 +45,20 @@ workflow: 节点使用`sources`和`targets`来分别指定当前节点的上游与下游节点,如下: ``` - Start: + start: type: start targets: - - Mvn_Deploy - Mvn_Deploy: - type: maven:3-jdk11 + - git_clone + git_clone: + type: git_clone:1.0.0 sources: - - Start + - start targets: - - End - End: + - end + end: type: end sources: - - Mvn_Deploy + - git_clone ``` `start`与`end`可以分别省略`sources`和`targets`定义,一个节点可以定义多个上游或下游节点 @@ -74,16 +74,18 @@ workflow: 在流程中配置节点时,可以覆盖`输入参数`的默认值,例如: ``` - Mvn_Deploy: - type: maven:3-jdk11 + git_clone: + type: git_clone:1.0.0 sources: - - Git_Clone + - start targets: - - End + - end param: - maven_snapshot_id: maven-snapshots - maven_public_id: maven-public - maven_release_id: maven-releases + ref: refs/heads/master + remote_url: https://gitee.com/jianmu-hub/dev-tools.git + netrc_machine: gitee.com + netrc_username: ((gitee.username)) + netrc_password: ((gitee.password)) ``` `输入参数`和`输出参数`也可以使用变量方式引用,详情参见[`变量章节`](vars.md) \ No newline at end of file diff --git a/guide/vars.md b/guide/vars.md index 94e874e..b8c4aa3 100644 --- a/guide/vars.md +++ b/guide/vars.md @@ -5,39 +5,33 @@ 可以在流程定义的`param`段落中定义全局变量,语法如下: ``` param: - branch_name: master - git_site: gitee.com + image_name: jianmudev/private ``` 然后可以在节点定义的输入参数中进行引用,语法如下: ``` - Git_Clone: - type: git:v1.0 - param: - commit_branch: ${global.branch_name} - netrc_machine: ${global.git_site} + maven_jib_build: + type: maven_build:1.2.0-jdk11 + param: + image_name: ${global.image_name} ``` ### 输出参数 可以在当前节点的输入参数中引用上游节点的输出参数的值: ``` - Hello_Jianmu: - type: hello_jianmu:latest - sources: - - Start - targets: - - Show_Message + git_clone: + type: git_clone:1.0.0 param: - hello_language: Chinese - Show_Message: - type: show_msg:latest - sources: - - Hello_Jianmu - targets: - - End + remote_url: https://gitee.com/jianmu-hub/jianmu-hub-server.git + ref: refs/heads/master + netrc_machine: gitee.com + netrc_username: ((gitee.username)) + netrc_password: ((gitee.password)) + maven_jib_build: + type: maven_build:1.2.0-jdk11 param: - msg: ${Hello_Jianmu.return_hello} + workspace: ${git_clone.git_path} ``` -如上所示,`Show_Message`节点可以使用`${Hello_Jianmu.return_hello}`的语法 +如上所示,`maven_jib_build`节点可以使用`${git_clone.git_path}`的语法 -引用`Hello_Jianmu`节点的输出参数`return_hello`的值作为输入参数`msg`的值 +引用`git_clone`节点的输出参数`git_path`的值作为输入参数`workspace`的值 -- Gitee