Skip to content

G
global-jenkinsfile
Commit 144216ce authored by wentao.suo's avatar wentao.suo
Browse files
Options

ffff

parent c9815e46
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
vars/qgDockerPiplineWithDockerSlave.groovy
View file @ 144216ce
...@@ -55,7 +55,7 @@ def call(body) { ...@@ -55,7 +55,7 @@ def call(body) {
def pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType) def pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType)
arrSystem = systemName.split("--") arrSystem = systemName.split("--")
for (systemNameSimple in arrSystem) { for (systemNameSimple in arrSystem) {
checkAndBuild(config.buildType, systemNameSimple, branchName, contextDir) checkAndBuild(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"],config.buildType, systemNameSimple, branchName, contextDir)
} }
} }
...@@ -111,8 +111,8 @@ def call(body) { ...@@ -111,8 +111,8 @@ def call(body) {
} }
def checkAndBuild(buildType,systemName,branchName,contextDir){ def checkAndBuild(dockerImage,dockerArgs,buildType,systemName,branchName,contextDir){
docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){ docker.image(dockerImage).inside(dockerArgs){
def project_attr = _stage.project_attr(systemName) def project_attr = _stage.project_attr(systemName)
def gitPath = project_attr["gitPath"] def gitPath = project_attr["gitPath"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment