generate-git-snapshot: Cannot delete the branch which you are currently on about jenkins-debian-glue HOT 11 CLOSED

Hm, works for me: http://jenkins.grml.org/job/eio-source/

I'm wondering about the:

+ git checkout HEAD
+ git branch -D jenkins-debian-glue-buildbranch24042

in your log though. The 'git checkout HEAD' should switch the branch so there should be no problem in deleting the temporary jenkins-debian-glue-buildbranch#### branch. What does adding 'git branch || true' and 'git status || true' after the "git checkout ${GIT_BRANCH}" (see at the end of the script) output for you?

from jenkins-debian-glue.

Hi,

thanks for the quick reply and testing.

Here is the output from the two command I added as requested:

++ readlink -f debian/changelog
+ git checkout -- /var/lib/jenkins/jobs/eio-source/workspace/source/debian/changelog
+ git checkout HEAD
+ git branch
* jenkins-debian-glue-buildbranch9179
  new
  upstream
+ git status
# On branch jenkins-debian-glue-buildbranch9179
nothing to commit (working directory clean)
+ git branch -D jenkins-debian-glue-buildbranch9179
error: Cannot delete the branch 'jenkins-debian-glue-buildbranch9179' which you are currently on.
Build step 'Execute shell' marked build as failure
Archiving artifacts
Recording fingerprints
Recording test results
Finished: FAILURE

One thing I have forgotten to mention is that I have added the following to the .gbp.conf (searched by google)

[git-buildpackage]
upstream-tree = HEAD

because without it I got this error:

+ echo 'Using git-buildpackage default options provided by jenkins-debian-glue'
Using git-buildpackage default options provided by jenkins-debian-glue
+ '[' '' = true ']'
+ git-buildpackage -nc --git-force-create --git-ignore-new -S -us -uc --git-verbose --git-builder=/bin/true --git-cleaner=/bin/true
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: /bin/true [] []
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/jenkins-debian-glue-buildbranch21604']
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'ls-tree', 'upstream/1.7.4']
fatal: Not a valid object name upstream/1.7.4
Build step 'Execute shell' marked build as failure
Archiving artifacts
Recording fingerprints
Recording test results
Finished: FAILURE

from jenkins-debian-glue.

The 'upstream-tree=HEAD' doesn't really make any sense, drop that. :)

The upstream tar ball creation basically seems to work for me:

+ git-buildpackage -nc --git-force-create --git-ignore-new -S -us -uc --git-verbose --git-builder=/bin/true --git-cleaner=/bin/true
/bin/true [] []
fatal: Not a valid object name upstream/1.7.4
eio_1.7.4.orig.tar.gz does not exist, creating from 'upstream'
Building upstream tarball with compression 'gzip -9'

Note the "eio_1.7.4.orig.tar.gz does not exist, creating from 'upstream'", is there any specific reason why you didn't tag the upstream/1.7.4 version (that's what git-buildpackage would expect here)?

from jenkins-debian-glue.

Mmmh. I think I miss something completely or haven´t understand.
Can you please attach a screenshot of your source job configuration?

from jenkins-debian-glue.

I've put my Jenkins job configuration online at http://michael-prokop.at/tmp/eio-source_config.xml

from jenkins-debian-glue.

Thanks. I have deleted my job and imported your definition, but no luck :-(

Here the output: https://www.i-matrixx.de/jenkins/job/eio-source/1/consoleText
Your output looks completely different. I think I must have missed something fundamental ...

from jenkins-debian-glue.

Which git-buildpackage version are you using?

from jenkins-debian-glue.

Oh and my previous question still stands:

Is there any specific reason why you didn't tag the upstream/1.7.4 version (that's what git-buildpackage would expect here)?

(I'm assuming git-buildpackage has different handling WRT upstream source usage depending on the git-buildpackage version in usage, so if you're using a git-buildpackage version newer than 0.5.10 this might be the issue, but the workflow actually should look like the upstream/X.Y.Z tagging.)

from jenkins-debian-glue.

I am using git-buildpackage 0.6.0~git20121124 from Debian unstable.

Regarding your questing why I didn't tag the upstream/1.7.4 version, I must admit that I don´t know what and how to do. Never really worked with git. I though I could just paste in the 'Repository URL' and I am fine...

from jenkins-debian-glue.

Ah right, then the problem is in the new behavior of more recent git-buildpackage versions, I'll dig deeper into that.

Regarding the upstream/1.7.4 tag: you need to "mark" an upstream release so the orig.tar.gz can be produced reliable and reproducible for a specific version, like documented in bullet point 5 in http://people.debian.org/~mika/forensics/maintainer.html#upstream - add the tag and it should work just fine. :)

from jenkins-debian-glue.

Note: the commit changes generate-git-snapshot in a way which clearly points to the according problem now and fixes the build problem you explored. So just upgrade jenkins-debian-glue, create the upstream/1.7.4 tag and it should work fine for you. :)

from jenkins-debian-glue.