Skip to content

Commit

Permalink
Bump jobdsl plugin to 1.67
Browse files Browse the repository at this point in the history 
* Bumped  version plugin to 1.67 in build.gradle
* Removed MapJobManagement obsolete methods, added the required one
* Fixed ScriptRequest constructors, removed deprecated location parameter
* Added required name argument to the job and view factory
* Removed  class="vector" from the triggers xml tag
* Removed name setter test cause this property is readonly
  • Loading branch information
@obaranov
obaranov authored Feb 8, 2019
1 parent 2b742c1 commit 152d85c
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 70 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies {
exclude(module: 'groovy')
}

compile('org.jenkins-ci.plugins:job-dsl-core:1.53') {
compile('org.jenkins-ci.plugins:job-dsl-core:1.67') {
exclude(module: 'groovy-all')
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/terrafolio/gradle/plugins/jenkins/dsl/JenkinsConfiguration.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class JenkinsConfiguration {
}

DslScriptLoader scriptLoader = new DslScriptLoader(jobManagement)
Collection<ScriptRequest> scriptRequests = files.collect { dslFile -> new ScriptRequest(dslFile.name, null, dslFile.parentFile.toURI().toURL(), false) }
Collection<ScriptRequest> scriptRequests = files.collect { dslFile -> new ScriptRequest(dslFile.text) }
GeneratedItems generatedItems = scriptLoader.runScripts(scriptRequests)

generatedItems.getJobs().each { generatedJob ->
Expand Down
4 changes: 2 additions & 2 deletions src/main/groovy/com/terrafolio/gradle/plugins/jenkins/dsl/JobDSLSupport.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ trait JobDSLSupport implements DSLSupport {

@Override
def String evaluateDSL(File dslFile) {
ScriptRequest request = new ScriptRequest(dslFile.name, null, dslFile.parentFile.toURI().toURL(), false)
ScriptRequest request = new ScriptRequest(dslFile.text)
DslScriptLoader scriptLoader = new DslScriptLoader(jobManagement)
GeneratedItems generatedItems = scriptLoader.runScripts([request])

Expand All @@ -26,7 +26,7 @@ trait JobDSLSupport implements DSLSupport {

@Override
def String evaluateDSL(String name, String type, Closure closure) {
def Job job = jobFactory.create(jobManagement, type)
def Job job = jobFactory.create(jobManagement, type, name)
// Load the existing xml as a template if it exists
if (jobManagement.getConfig(name) && job.templateName == null) {
job.using(name)
Expand Down
4 changes: 2 additions & 2 deletions src/main/groovy/com/terrafolio/gradle/plugins/jenkins/dsl/ViewDSLSupport.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ trait ViewDSLSupport implements DSLSupport {

@Override
String evaluateDSL(File dslFile) {
ScriptRequest request = new ScriptRequest(dslFile.name, null, dslFile.parentFile.toURI().toURL(), false)
ScriptRequest request = new ScriptRequest(dslFile.text)
DslScriptLoader scriptLoader = new DslScriptLoader(jobManagement)
GeneratedItems generatedItems = scriptLoader.runScripts([request])

Expand All @@ -26,7 +26,7 @@ trait ViewDSLSupport implements DSLSupport {

@Override
String evaluateDSL(String name, String type, Closure closure) {
View view = viewFactory.createView(jobManagement, type)
View view = viewFactory.createView(jobManagement, type, name)
view.with(closure)
jobManagement.createOrUpdateView(name, view.xml, true)
return name
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/DSLJobFactory.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import javaposse.jobdsl.dsl.JobManagement


interface DSLJobFactory {
Job create(JobManagement management, String type)
Job create(JobManagement management, String type, String jobName)
}
4 changes: 2 additions & 2 deletions src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/DSLViewFactory.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import javaposse.jobdsl.dsl.View


interface DSLViewFactory {
View createView(JobManagement management, String type)
}
View createView(JobManagement management, String type, String viewName)
}
4 changes: 2 additions & 2 deletions src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/DefaultDSLJobFactory.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import javaposse.jobdsl.dsl.JobManagement

class DefaultDSLJobFactory implements DSLJobFactory {
@Override
Job create(JobManagement management, String type) {
Job create(JobManagement management, String type, String jobName) {
Class<? extends Job> jobClass
if (type == null) {
jobClass = DSLJobType.Freeform.jobClass
} else {
jobClass = DSLJobType.find(type).jobClass
}

return jobClass.newInstance(management)
return jobClass.newInstance(management, jobName)
}
}
4 changes: 2 additions & 2 deletions src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/DefaultDSLViewFactory.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import javaposse.jobdsl.dsl.View

class DefaultDSLViewFactory implements DSLViewFactory {
@Override
View createView(JobManagement management, String type) {
View createView(JobManagement management, String type, String viewName) {
Class<? extends View> viewClass
if (type == null) {
viewClass = DSLViewType.ListView.viewClass
} else {
viewClass = DSLViewType.find(type).viewClass
}

return viewClass.newInstance(management)
return viewClass.newInstance(management, viewName)
}
}
17 changes: 6 additions & 11 deletions src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/MapJobManagement.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ class MapJobManagement extends AbstractJobManagement {
return true
}

@Override
String createOrUpdateConfigFile(ConfigFile configFile, boolean ignoreExisting){
return null
}

@Override
void createOrUpdateView(String viewName, String config, boolean ignoreExisting) throws NameNotProvidedException, ConfigurationMissingException {
validateUpdateArgs(viewName, config)
Expand All @@ -45,7 +40,12 @@ class MapJobManagement extends AbstractJobManagement {
boolean isMinimumPluginVersionInstalled(String pluginShortName, String version) {
return false
}


@Override
boolean isMinimumCoreVersion(String version) {
return false
}

@Override
void requireMinimumPluginVersion(String pluginShortName, String version){
}
Expand All @@ -59,11 +59,6 @@ class MapJobManagement extends AbstractJobManagement {
return null
}

@Override
String getConfigFileId(ConfigFileType type, String name){
return null
}

@Override
void renameJobMatching(String previousNames, String destination) throws IOException {
}
Expand Down
2 changes: 1 addition & 1 deletion ...est/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JenkinsConfigurationTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class JenkinsConfigurationTest extends ProjectSpec {
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers class='vector'></triggers>
<triggers></triggers>
<concurrentBuild>false</concurrentBuild>
<builders></builders>
<publishers></publishers>
Expand Down
20 changes: 0 additions & 20 deletions src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JobDSLSupportTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,6 @@ class JobDSLSupportTest extends TempDirSpec {
new Diff(JobFixtures.FREEFORM_DSL_JOB_XML, support.getConfig('test')).similar()
}

def "evaluateDSL from closure creates correct XML" (String type, String expectedXml) {
setup:
Closure dsl = {
name = "test"
}
support = new TestDSLSupport(new MapJobManagement(new HashMap<String, String>()))
XMLUnit.setIgnoreWhitespace(true)

expect:
support.evaluateDSL('test', type, dsl) == 'test'
new Diff(expectedXml, support.getConfig('test')).similar()

where:
type | expectedXml
'Freeform' | JobFixtures.FREEFORM_DSL_JOB_XML
'Maven' | JobFixtures.MAVEN_DSL_JOB_XML
'Multijob' | JobFixtures.MULTIJOB_DSL_JOB_XML
'Buildflow' | JobFixtures.BUILDFLOW_DSL_JOB_XML
}

class TestDSLSupport implements JobDSLSupport {
final JobManagement jobManagement

Expand Down
8 changes: 4 additions & 4 deletions src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/JobFixtures.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class JobFixtures {
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers class='vector'></triggers>
<triggers></triggers>
<concurrentBuild>false</concurrentBuild>
<builders></builders>
<publishers></publishers>
Expand All @@ -33,7 +33,7 @@ class JobFixtures {
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers class="vector"/>
<triggers/>
<concurrentBuild>false</concurrentBuild>
<aggregatorStyleBuild>true</aggregatorStyleBuild>
<incrementalBuild>false</incrementalBuild>
Expand All @@ -58,7 +58,7 @@ class JobFixtures {
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers class="vector"/>
<triggers/>
<concurrentBuild>false</concurrentBuild>
<builders/>
<publishers/>
Expand All @@ -76,7 +76,7 @@ class JobFixtures {
<disabled>false</disabled>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<triggers class="vector"/>
<triggers/>
<concurrentBuild>false</concurrentBuild>
<builders/>
<publishers/>
Expand Down
21 changes: 0 additions & 21 deletions src/test/groovy/com/terrafolio/gradle/plugins/jenkins/test/dsl/ViewDSLSupportTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,27 +95,6 @@ class ViewDSLSupportTest extends TempDirSpec {
new Diff(ViewFixtures.SECTIONED_DSL_VIEW_XML, support.getConfig('test')).similar()
}
def "evaluateDSL from closure creates correct XML" () {
setup:
Closure dsl = {
name = "test"
}
support = new TestViewDSLSupport(new MapJobManagement(new HashMap<String, String>()))
XMLUnit.setIgnoreWhitespace(true)
expect:
support.evaluateDSL('test', viewType, dsl) == 'test'
new Diff(xmlToMatch, support.getConfig('test')).similar()
where:
viewType | xmlToMatch
null | ViewFixtures.LIST_DSL_VIEW_XML
'ListView' | ViewFixtures.LIST_DSL_VIEW_XML
'BuildPipelineView' | ViewFixtures.BUILD_PIPELINE_VIEW_XML
'NestedView' | ViewFixtures.NESTED_DSL_VIEW_XML
'SectionedView' | ViewFixtures.SECTIONED_DSL_VIEW_XML
}
static class TestViewDSLSupport implements ViewDSLSupport {
final JobManagement jobManagement
Expand Down

0 comments on commit 152d85c

Please sign in to comment.