Details
-
Bug
-
Status: Closed (View Workflow)
-
Minor
-
Resolution: Fixed
-
None
Description
_Initial job configuration_
- Four repositories in MultiScm configuration - one svn, three git
- Two git repositories in one MultiScm SCM configurations:
- *repo1*, named so it becomes default named `repo1`
- *repo2*, named so it becomes default named `repo2`
- branch specifier `*ready/*`
- Checkout to sub-directory: repo1s
- Prune stale remote-tracking branches
- Wipe out repository & force clone
- One git repository in one MultiScm SCM configurations:
- *repo3*, named: `repo3`
- branch specifier `*ready/*`
- Checkout to sub-directory: repo3
- Prune stale remote-tracking branches
- Wipe out repository & force clone
- One SVN repository in one MultiScm SCM configuration:
- svn-repo checkout path
- pretested integration configuration:
- `master`
- `repo3`
- Accummulated strategy
_Observations_
- Pushing a ready branch to `repo3`, but there is nothing to do reported with error `Nothing to do the reason is: The branch name (repo3/ready/dev_865487921) used by git, did not match a remote branch name. You might already have integrated the branch`
The problem is in the findSCM method, that just always return the first found SCM.
Attachments
Activity
Code changed in jenkins
User: Bue Petersen
Path:
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/MultipleScm_threeRepos_IT.java
http://jenkins-ci.org/commit/pretested-integration-plugin/3afb27572e7e39bb6ef640bb76895bf6ef71eb70
Log:
JENKINS-25960: Test for issue.
Code changed in jenkins
User: Bue Petersen
Path:
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitMessages.java
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java
http://jenkins-ci.org/commit/pretested-integration-plugin/452398047cb4c1e6e843030f3934acdc75ffdf23
Log:
JENKINS-25960: MultiScm fix - resolve git client:
When resolving the git client for MultiSCM we should chose the first
found git scm, but the one that matches the build data set.
- changed the findScm to select not the first, but the relevant git scm
client - changed error message in strategies to match better description of the
problem, which is two-fold thus two things mentioned in error message - Implemeted a shared message setup, also to be used in tests.
Code changed in jenkins
User: Bue Petersen
Path:
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/MultipleScm_threeRepos_IT.java
http://jenkins-ci.org/commit/pretested-integration-plugin/6e27a1ed2eeb8e9321e6624534a2ca15eb1b79f6
Log:
JENKINS-25960: Updated error msg in test to match.
Code changed in jenkins
User: Bue Petersen
Path:
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/BuildResultValidator.java
http://jenkins-ci.org/commit/pretested-integration-plugin/64208a4f0303ced609e075233eb804b6e7fc7575
Log:
JENKINS-25960: Fixed tests due testutils change
Code changed in jenkins
User: Bue Petersen
Path:
src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java
http://jenkins-ci.org/commit/pretested-integration-plugin/e7412ff87bc550a4603c6a5b0f3569af731f905e
Log:
JENKINS-25960: Not directly releated to issue: