We have setup Gated commit using Jenkins.
Developers must push their changes to the staging branch. The GatedCheckin project will perform validation and push the changes to origin/development.
However, If your feature branch is not up-to-date with the origin/development, the push from Jenkins after gated commit validation will fail (with the below error:
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the..)
We will run into this if someone tries to submit changes when a gatedcheckin build is currently running.
Jenkins has a "pre-build merge" option which might solve this issue for us. However I am running into some issues setting this up:
Checking out the repo on the slave machines is failing:
Building remotely on casa_gated (wingated) in workspace <http://casa_linux/job/GatedCheckin/label=wingated/ws/>
> C:\Program Files (x86)\Git\bin\git.exe rev-parse --is-inside-work-tree Fetching changes from the remote Git repository > C:\Program Files (x86)\Git\bin\git.exe config remote.origin.url https://git01.codeplex.com/casablanca
Fetching upstream changes from https://git01.codeplex.com/casablanca
> C:\Program Files (x86)\Git\bin\git.exe --version > C:\Program Files (x86)\Git\bin\git.exe fetch --tags --progress https://git01.codeplex.com/casablanca +refs/heads/*:refs/remotes/origin/*
Checking out Revision a8dc7afdb609d572c5d7cfa8864295310c9e9e2a () > C:\Program Files (x86)\Git\bin\git.exe config core.sparsecheckout > C:\Program Files (x86)\Git\bin\git.exe checkout -f a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
FATAL: Could not checkout null with start point a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
hudson.plugins.git.GitException: Could not checkout null with start point a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$8.execute(CliGitAPIImpl.java:1497)
at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:153)
at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:146)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at hudson.remoting.Engine$1$1.run(Engine.java:63)
at java.lang.Thread.run(Unknown Source) Caused by: hudson.plugins.git.GitException: Command "C:\Program Files (x86)\Git\bin\git.exe checkout -f a8dc7afdb609d572c5d7cfa8864295310c9e9e2a" returned status code 128:
stdout:
stderr: fatal: reference is not a tree: a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
Comments: This is a known issue with the jenkins git plugin and is being tracked under: https://issues.jenkins-ci.org/browse/JENKINS-23179
Developers must push their changes to the staging branch. The GatedCheckin project will perform validation and push the changes to origin/development.
However, If your feature branch is not up-to-date with the origin/development, the push from Jenkins after gated commit validation will fail (with the below error:
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the..)
We will run into this if someone tries to submit changes when a gatedcheckin build is currently running.
Jenkins has a "pre-build merge" option which might solve this issue for us. However I am running into some issues setting this up:
Checking out the repo on the slave machines is failing:
Building remotely on casa_gated (wingated) in workspace <http://casa_linux/job/GatedCheckin/label=wingated/ws/>
> C:\Program Files (x86)\Git\bin\git.exe rev-parse --is-inside-work-tree Fetching changes from the remote Git repository > C:\Program Files (x86)\Git\bin\git.exe config remote.origin.url https://git01.codeplex.com/casablanca
Fetching upstream changes from https://git01.codeplex.com/casablanca
> C:\Program Files (x86)\Git\bin\git.exe --version > C:\Program Files (x86)\Git\bin\git.exe fetch --tags --progress https://git01.codeplex.com/casablanca +refs/heads/*:refs/remotes/origin/*
Checking out Revision a8dc7afdb609d572c5d7cfa8864295310c9e9e2a () > C:\Program Files (x86)\Git\bin\git.exe config core.sparsecheckout > C:\Program Files (x86)\Git\bin\git.exe checkout -f a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
FATAL: Could not checkout null with start point a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
hudson.plugins.git.GitException: Could not checkout null with start point a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$8.execute(CliGitAPIImpl.java:1497)
at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:153)
at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:146)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at hudson.remoting.Engine$1$1.run(Engine.java:63)
at java.lang.Thread.run(Unknown Source) Caused by: hudson.plugins.git.GitException: Command "C:\Program Files (x86)\Git\bin\git.exe checkout -f a8dc7afdb609d572c5d7cfa8864295310c9e9e2a" returned status code 128:
stdout:
stderr: fatal: reference is not a tree: a8dc7afdb609d572c5d7cfa8864295310c9e9e2a
Comments: This is a known issue with the jenkins git plugin and is being tracked under: https://issues.jenkins-ci.org/browse/JENKINS-23179