在 Jenkins 构建中没有更新 Git 子模块

我在 Jenkins 的一个项目中有一个子模块。我已经启用了高级设置来递归地更新子模块。

当我运行构建时,我看到工作区中有来自子模块的文件。问题是,这似乎是子模块的第一个修订版。当我推送更改(存储库托管在 GitHub 上)时,Jenkins 似乎没有更新子模块以获得正确的更改。有人见过这个吗?

99097 次浏览

It looks like I found a solution:

I added a build step to execute the following shell commands:

git submodule foreach git checkout master
git submodule foreach git pull

Are you aware that your Git repository always refers to a particular revision of a submodule? Jenkins is not going to automatically change the revision.

If you want to take a newer revision of the submodule into use, you have to do this in your local Git repository:

cd submoduledir
git pull
cd ..
git add submoduledir
git commit -m 'Updated to latest revision of submoduledir'
git push # Go and watch Jenkins build with the new revision of the submodule

When you do it like this, Jenkins will check out the exact same revision of the submodule during the build. Jenkins does not on its own decide which revision of the submodule to use. This is the fundamental difference between Git submodules and SVN externals.

You might want to read a good reference on submodules, e.g. http://progit.org/book/ch6-6.html.

If you are using Jenkins Git module, you can set it to "Wipe out workspace before build", this way it will always gets the correct sub module.

Note that the Jenkins Git plugin 2.0 will have "advance submodule behaviors", which should ensure proper updates of the submodules:

git 2.0

As commented by vikramvi:

Advanced sub-modules behavior > "Path of the reference repo to use during submodule update" against this field , add submodule git url.

Path


Owen B mentions in the comments:

For the authentication issue, there's now a "Use credentials from default remote of parent repository" option

Seen here in JENKINS-20941:

https://issues.jenkins-ci.org/secure/attachment/33245/Screen%20Shot%202016-07-08%20at%2010.09.17.png

Finally stumbled on a way to do this and it's simple.

The Issue:

The initial clone with credentials works fine but subsequent submodule cloning fails with incorrect credentials.

  1. Automatic advanced sub-module cloning: Source Code Management >> Additional Behaviours >> Advanced sub-modules behaviours: results in credential error.
  2. git submodule update --init in the Execute Shell section also fails with credentials error.

The Solution:

I'm using jenkins-1.574.

  1. Check the Build Environment >> SSH Agent box.
  2. Select the correct credentials (probably the same as selected in Source Code Management section
  3. Update submodules in the Execute Shell section

    git submodule sync
    git submodule update --init --recursive
    

Here's a screen shotenter image description here

This is covered in the Git Plugin documentation on the Jenkins site under the section: Recursive submodules.

excerpt

The GIT plugin supports repositories with submodules which in turn have submodules themselves. This must be turned on though: in Job Configuration -> Section Source Code Management, Git -> Advanced Button (under Branches to build) -> Recursively update submodules.

Example

From the configuration screen of your job, in the Source Code Management section, pull the Add button down select "Advanced sub-modules behavior".

   s1

                                 s2

Then select "Recursively update submodules":

   s3

I am using scripted pipelining with the checkout plugin. If you want the submodules to be the same as in your repository, simply switch off the trackingSubmodules option like this:

checkout([$class: 'GitSCM', branches: [[name: '*/develop']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: false, reference: '', trackingSubmodules: false]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '[myCredentials]', url: 'https://git.myRepo.git']]])

On "Advanced sub-modules behaviours", check "Update tracking submodules to tip of branch"

Reference Image