Git – Jenkins Git plugin trying to build old revision during release build

gitgithubJenkinsjenkins-pluginsmaven-release-plugin

I'm trying to release a Maven project using the maven-release-plugin. The Jenkins Git plugin doesn't seem to be checking out the repo correctly.

Below is my Jenkins Job configuration

Repository URL : git@githubenterprise:/user/repo.git

Branches to build: */master

Repository browser: Auto

Additional Behaviours:

  Checkout to specific local branch : master

Git Build data for the failed release shows

Revision: 267**
refs/remotes/origin/origin/master
Built Branches

refs/remotes/origin/master: Build #4 of Revision 755** 
(refs/remotes/origin/master)
refs/remotes/origin/origin/master: Build #10 of Revision 267*** 
(refs/remotes/origin/origin/master)

The job console shows

Multiple candidate revisions
Scheduling another build to catch up with MyJenkinsBuildJob
Checking out Revision 267** (refs/remotes/origin/origin/master)

755** is the latest commit on the repository, bu the Git Plugin is checking out 267** revision. So the build fails when the maven-release-plugin tries to push back the release prepared release from an old commit.

The git-push command failed.
Command output:
To ssh://git@githubenterprise:/user/repo.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://git@githubenterprise:/user/repo.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.

How to make the Jenkins Git Plugin checkout only the latest revision(755* in my case) instead of trying to build multiple checkouts(not sure why it does that)

Best Answer

this was due to the fact that someone had pushed a branch with name "origin/master" which matched with the Branches to build: */master configuration which I had provided.So the Git plugin was trying to checkout both these matching branches ("master" and "origin/master") and build them

Removing the wildcard and setting the branch specifier to remotes/origin/master solved the problem.

How do you create a new project/repository?

A git repository is simply a directory containing a special .git directory.

This is different from "centralised" version-control systems (like subversion), where a "repository" is hosted on a remote server, which you checkout into a "working copy" directory. With git, your working copy is the repository.

Simply run git init in the directory which contains the files you wish to track.

For example,

cd ~/code/project001/
git init

This creates a .git (hidden) folder in the current directory.

To make a new project, run git init with an additional argument (the name of the directory to be created):

git init project002

(This is equivalent to: mkdir project002 && cd project002 && git init)

To check if the current current path is within a git repository, simply run git status - if it's not a repository, it will report "fatal: Not a git repository"

You could also list the .git directory, and check it contains files/directories similar to the following:

$ ls .git
HEAD         config       hooks/       objects/
branches/    description  info/        refs/

If for whatever reason you wish to "de-git" a repository (you wish to stop using git to track that project). Simply remove the .git directory at the base level of the repository.

cd ~/code/project001/
rm -rf .git/

Caution: This will destroy all revision history, all your tags, everything git has done. It will not touch the "current" files (the files you can currently see), but previous changes, deleted files and so on will be unrecoverable!

Git – How to view an old version of a file with Git

You can use git show with a path from the root of the repository (./ or ../ for relative pathing):

$ git show REVISION:path/to/file

Replace REVISION with your actual revision (could be a Git commit SHA, a tag name, a branch name, a relative commit name, or any other way of identifying a commit in Git)

For example, to view the version of file <repository-root>/src/main.c from 4 commits ago, use:

$ git show HEAD~4:src/main.c

Git for Windows requires forward slashes even in paths relative to the current directory. For more information, check out the man page for git-show.

Best Answer

Related Solutions

Git for beginners: The definitive practical guide

How do you create a new project/repository?

Git – How to view an old version of a file with Git

Related Topic