Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@zackliu
zackliu committed Jul 15, 2016
1 parent 29caa91 commit 9ab7709
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 139 deletions.
32 changes: 28 additions & 4 deletions dslJob.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def e2eSettings = new JsonSlurper().parseText(jsonPayloadE2e)

def getParameter(variable, defaultSettings, userSettings)
{
if(userSettings["$variable"] != null) return userSettings["$variable"]
if(defaultSettings["$variable"] != null) return defaultSettings["$variable"]
if(userSettings != null && userSettings["$variable"] != null) return userSettings["$variable"]
if(defaultSettings != null && defaultSettings["$variable"] != null) return defaultSettings["$variable"]
return null;
}

Expand Down Expand Up @@ -80,7 +80,7 @@ def createJob(defaultSettings, userSettings)
def shellEnabled = getParameter("shellEnabled", defaultSettings, userSettings)
if(shellEnabled == true)
{
step
steps
{
shell(getParameter("shell", defaultSettings, userSettings).join('\n'))
}
Expand Down Expand Up @@ -159,4 +159,28 @@ def createJob(defaultSettings, userSettings)
}
}

createJob(jobsSettings.workflow[0].jobs[0], nodeSettings)
def createBranch(userSettings)
{
branch = userSettings.branch

userSettings.jobs.each
{
jobSettings ->
def defaultSettings = null
if(jobSettings.template == "nodeDefault") defaultSettings = nodeSettings
else if (jobSettings.template == "e2eDefault") defaultSettings = e2eSettings
createJob(defaultSettings, jobSettings)
}
}

def createWorkflow(userSettings)
{
partner = userSettings.partner
userSettings.workflow.each
{
branchSettings ->
createBranch(branchSettings)
}
}

createWorkflow(jobsSettings)
9 changes: 4 additions & 5 deletions e2eDefault.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"git":{
"name": null,
"repo": "ssh://[email protected]:22/VSChina/_git/Template.Docs",
"credentials": "a12a969a-f987-40d6-b8ff-91b0df2a601e",
"credentials": null,
"branches": "develop",

"mergeOptionsEnabled": false,
Expand All @@ -29,14 +29,14 @@
"upstream": null
},

"shellEnabled": true,
"shellEnabled": false,
"shell": null,

"publishersEnabled": true,
"publishers":{
"artifactArchiverEnabled": false,
"FilesToArchive": "result/e2e/screenshots/**/*.*",

"extendedEmailEnabled": false,
"extendedEmail":{
"recipientList": "[email protected], [email protected], [email protected], [email protected], [email protected], [email protected]",
Expand Down Expand Up @@ -68,7 +68,6 @@
"pushOnlyIfSuccess": true,
"pushMerge": true
}



}
}
166 changes: 36 additions & 130 deletions jobs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"branch": "develop",
"jobs":[
{
"template": "node",
"template": "nodeDefault",
"name": "develop_ci",

"shellEnabled": true,
Expand All @@ -14,7 +14,7 @@
"npm run opst init",
"npm run opst -- deployTheme -B ${codeBranch}"
],

"publishersEnabled":true,
"publishers":{
"extendedEmailEnabled": true,
Expand All @@ -25,168 +25,74 @@
},

{
"template": "nodeDefault",
"name": "develop_opbuild",
"template": "node",
"triggersUpstream": "develop_ci",
"shell":[
"npm install \n"

],
"extendedEmailEnabled": true,
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
},

{
"name": "develop_e2e",
"template": "protractor",
"triggerEnabled": true,
"triggersUpstream": "develop_opbuild",
"trigger":{
"upstream": "develop_ci"
},

"shellEnabled": true,
"shell":[
"npm install \n"

],

"publishersEnabled":true,
"publishers":{
"artifactArchiverEnabled": true,
"extendedEmailEnabled": true,
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
"extendedEmail":{
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
}
}
},

{
"name": "develop_merge",
"template": "node",
"triggersUpstream": "develop_e2e",
"git":{
"name": "Template.Docs",
"mergeOptions": true,
"mergeBranch": "release",
"mergeRemote": "Template.Docs"
},
"shellEnabled": false,
"gitPublisherEnabled": true
}
]
},
"name": "develop_e2e",
"template": "e2eDefault",

{
"branch": "release",
"jobs":[
{
"name": "release_ci",
"template": "node",
"shell":[
"npm install",
"npm run opst init",
"npm run opst -- deployTheme -B ${codeBranch}"
],
"extendedEmailEnabled": true,
"triggersAlwaysEnabled": true
},
"triggerEnabled": true,
"triggersUpstream": "develop_opbuild",

{
"name": "release_opbuild",
"template": "node",
"triggersUpstream": "release_ci",
"shellEnabled": true,
"shell":[
"npm install \n"
],
"extendedEmailEnabled": true,
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
},

{
"name": "release_e2e",
"template": "protractor",
"triggerEnabled": true,
"triggersUpstream": "release_opbuild",
"shell":[
"npm install \n"
],
"publishersEnabled":true,
"publishers":{
"artifactArchiverEnabled": true,
"extendedEmailEnabled": true,
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
"extendedEmail":{
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
}
}
}
]
},

{
"branch": "hotfix",
"jobs":[
{
"name": "hotfix_ci",
"template": "node",
"shell":[
"npm install"
],
"extendedEmailEnabled": true,
"triggersAlwaysEnabled": true
},

{
"name": "hotfix_opbuild",
"template": "node",
"triggersUpstream": "hotfix_ci",
"shell":[
"npm install \n"
],
"extendedEmailEnabled": true,
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
},
"name": "develop_merge",
"template": "nodeDefault",

{
"name": "hotfix_e2e",
"template": "protractor",
"triggerEnabled": true,
"triggersUpstream": "hotfix_opbuild",
"shell":[
"npm install \n"
],
"publishers":{
"artifactArchiverEnabled": true,
"extendedEmailEnabled": true,
"triggersFailureEnabled": true,
"triggersFixedEnabled": true
}
},
"triggersUpstream": "develop_e2e",

{
"name": "hotfix_merge",
"template": "node",
"triggersUpstream": "hotfix_e2e",
"git":{
"name": "Template.Docs",
"mergeOptions": true,
"mergeBranch": "release",
"mergeRemote": "Template.Docs"

"mergeOptionsEnabled": true,
"mergeOptions":{
"branch": "release",
"remote": "Template.Docs"
}
},
"shellEnabled": false,
"gitPublisherEnabled": true
}
]
},

{
"branch": "master",
"jobs":[
{
"name": "master_ci",
"template": "node",
"shell":[
"npm install",
"npm run opst init",
"npm run opst -- deployTheme -B ${codeBranch}"
],
"extendedEmailEnabled": true,
"triggersAlwaysEnabled": true
"publishers":{
"gitEnabled": true
}
}

]
}
]
Expand Down

0 comments on commit 9ab7709

Please sign in to comment.