Skip to content

Added support of using trackingSubmodules in the DSL for git submodules. #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zjfroot wants to merge 4 commits into from
Closed

Added support of using trackingSubmodules in the DSL for git submodules. #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48fa591
Added support of trackingSubmodules in the DSL for git submodules.
Oct 15, 2015
ed6095d
Added missing javadoc with @since and description of the method
Oct 16, 2015
82dce10
Remove the accidently added idea plugin from build.gradle
Oct 16, 2015
53ad5cb
Remove the extra blank line introduced
Oct 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/ScmContext.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class ScmContext extends AbstractExtensibleContext {
configVersion '2'
disableSubmodules 'false'
recursiveSubmodules gitContext.recursiveSubmodules
trackingSubmodules gitContext.trackingSubmodules
doGenerateSubmoduleConfigurations 'false'
authorOrCommitter 'false'
clean gitContext.clean
Expand Down
9 changes: 9 additions & 0 deletions job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/scm/GitContext.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class GitContext extends AbstractContext {
boolean pruneBranches = false
boolean ignoreNotifyCommit = false
boolean recursiveSubmodules = false
boolean trackingSubmodules = false
String localBranch
String relativeTargetDir
String reference = ''
Expand Down Expand Up @@ -169,6 +170,14 @@ class GitContext extends AbstractContext {
this.recursiveSubmodules = recursive
}

/**
* Update tracking submodules to tip of branch. Defaults to {@code false}
* @since 1.40
*/
void trackingSubmodules(boolean tracking = true) {
this.trackingSubmodules = tracking
}

/**
* Prunes obsolete local branches. Defaults to {@code false}.
*/
Expand Down
3 changes: 3 additions & 0 deletions job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/DslSampleSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ class DslSampleSpec extends Specification {
<configVersion>2</configVersion>
<disableSubmodules>false</disableSubmodules>
<recursiveSubmodules>false</recursiveSubmodules>
<trackingSubmodules>false</trackingSubmodules>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<authorOrCommitter>false</authorOrCommitter>
<clean>false</clean>
Expand Down Expand Up @@ -300,6 +301,7 @@ mavenJob('PROJ-maven-with-template') {
<configVersion>2</configVersion>
<disableSubmodules>false</disableSubmodules>
<recursiveSubmodules>false</recursiveSubmodules>
<trackingSubmodules>false</trackingSubmodules>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<authorOrCommitter>false</authorOrCommitter>
<clean>false</clean>
Expand Down Expand Up @@ -353,6 +355,7 @@ mavenJob('PROJ-maven-with-template') {
<configVersion>2</configVersion>
<disableSubmodules>false</disableSubmodules>
<recursiveSubmodules>false</recursiveSubmodules>
<trackingSubmodules>false</trackingSubmodules>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<authorOrCommitter>false</authorOrCommitter>
<clean>false</clean>
Expand Down
37 changes: 37 additions & 0 deletions job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/helpers/ScmContextSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,43 @@ class ScmContextSpec extends Specification {
1 * mockJobManagement.logPluginDeprecationWarning('git', '2.2.6')
}

def 'call git scm with trackingSubmodules with default true'() {
when:
context.git {
remote {
url('https://github.com/jenkinsci/job-dsl-plugin.git')
}
trackingSubmodules()
}

then:
with(context.scmNodes[0]) {
trackingSubmodules[0].value() == true
}
1 * mockJobManagement.requirePlugin('git')
1 * mockJobManagement.logPluginDeprecationWarning('git', '2.2.6')
}

def 'call git scm with trackingSubmodules with param'(boolean value) {
when:
context.git {
remote {
url('https://github.com/jenkinsci/job-dsl-plugin.git')
}
trackingSubmodules(value)
}

then:
with(context.scmNodes[0]) {
trackingSubmodules[0].value() == value
}
1 * mockJobManagement.requirePlugin('git')
1 * mockJobManagement.logPluginDeprecationWarning('git', '2.2.6')

where:
value << [true, false]
}

def 'call git scm with recursiveSubmodules with param'(boolean value) {
when:
context.git {
Expand Down