CODEWITHSUNDEEP
gitjenkinscontinuous-integration
postelrich
postelrich

Reputation: 3496

Git & CI: How to tag if build passes/revert commit if fails?

I am trying to setup jenkins for continuous integration with my python repo. I have everything working in that it will poll for updates to the repo and then run nosetests and either succeed or fail depending on the result of the tests. If the tests pass, I want it to tag the commits from the latest push with build number ("v1.0.$BUILD_NUMBER"). If the tests fail, I want it to revert to the previous tag.

What is the proper way to tag the commits from the latest push? What is the proper way to revert if it fails?

I am getting confused on subtleties of annotated vs lightweight tags and revert vs reset. Especially the latter can really screw things up if used incorrectly.

Upvotes: 1

Views: 2785

Answers (2)

sti
sti

Reputation: 11075

Wouldn't it be much easier for everyone if you would configure jenkins to merge with master before the build and test. Then, if tests pass, jenkins can push the result to master. If tests fail, there is nothing to revert.

Upvotes: 1

j3ny4
j3ny4

Reputation: 441

revert creates a new commit that includes the inverse content to the content of the commit you're revert.

The git repo before:

A---B---C

git revert C

The git repo after:

A---B---C---C'

C' is an inverse commit to C.

reset sets a new value (SHA) to a branch (like it was a pointer). Do neither produce nor deletes a commit. Resetting a branch that is shared between several developers is considered as a "brutal" behavior and will put your co-developers in a problematic state so if they aren't aware of the reset they might merge the commit (you wanted to remove) again.

The git repo before (current branch is master):

A---B---C
         \
          master

git reset B

The git repo after:

A---B---C
     \
      master

The master branch now points to commit B. Commit C is there but nothing points to it, so it will be garbage collected probably.

From AlBlue’s Blog

An annotated tag creates an additional tag object in the Git repository, which allows you to store information associated with the tag itself. This may include release notes, the meta-information about the release, and optionally a signature to verify the authenticity of the commit to which it points.

VS

A lightweight tag holds nothing except of the SHA of the commit it was stacked to.

Upvotes: 2

Related Questions