diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2015-04-22 16:15:26 -0400 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2015-04-22 16:36:54 -0400 |
commit | 8f0e10e33726db46da1882b03d2e3a6a9689924c (patch) | |
tree | 36c9ca09db2e65bc9615288e5d565200048aa7f7 /git/parent.rb | |
parent | b3c9e90b10dd5708454628ea037708cfd8374599 (diff) | |
download | openshift-8f0e10e33726db46da1882b03d2e3a6a9689924c.tar.gz openshift-8f0e10e33726db46da1882b03d2e3a6a9689924c.tar.bz2 openshift-8f0e10e33726db46da1882b03d2e3a6a9689924c.tar.xz openshift-8f0e10e33726db46da1882b03d2e3a6a9689924c.zip |
Adding commit hooks for jenkins
Diffstat (limited to 'git/parent.rb')
-rwxr-xr-x | git/parent.rb | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/git/parent.rb b/git/parent.rb new file mode 100755 index 000000000..2acb127c4 --- /dev/null +++ b/git/parent.rb @@ -0,0 +1,45 @@ +#!/usr/bin/env ruby +# +# +# + +if __FILE__ == $0 + # If we aren't on master we don't need to parent check + branch = 'prod' + exit(0) if ARGV[0] !~ /#{branch}/ + commit_id = ARGV[1] + %x[/usr/bin/git checkout #{branch}] + %x[/usr/bin/git merge #{commit_id}] + + count = 0 + #lines = %x[/usr/bin/git rev-list --left-right stg...master].split("\n") + lines = %x[/usr/bin/git rev-list --left-right remotes/origin/stg...#{branch}].split("\n") + lines.each do |commit| + # next if they are in stage + next if commit =~ /^</ + # remove the first char '>' + commit = commit[1..-1] + # check if any remote branches contain $commit + results = %x[/usr/bin/git branch -q -r --contains #{commit} 2>/dev/null ] + # if this comes back empty, nothing contains it, we can skip it as + # we have probably created the merge commit here locally + next if results.empty? + + # The results generally contain origin/pr/246/merge and origin/pr/246/head + # this is the pull request which would contain the commit in question. + # + # If the results do not contain origin/stg then stage does not contain + # the commit in question. Therefore we need to alert! + unless results =~ /origin\/stg/ + puts "\nFAILED: (These commits are not in stage.)\n" + puts "\t#{commit}" + count += 1 + end + end + + # Exit with count of commits in #{branch} but not stg + exit(count) +end + +__END__ + |