216 lines
8.0 KiB
Python
216 lines
8.0 KiB
Python
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import git
|
|
import os
|
|
import logging
|
|
import model
|
|
|
|
|
|
class ZuulReference(git.Reference):
|
|
_common_path_default = "refs/zuul"
|
|
_points_to_commits_only = True
|
|
|
|
|
|
class Repo(object):
|
|
log = logging.getLogger("zuul.Repo")
|
|
|
|
def __init__(self, remote, local):
|
|
self.remote_url = remote
|
|
self.local_path = local
|
|
self._ensure_cloned()
|
|
self.repo = git.Repo(self.local_path)
|
|
|
|
def _ensure_cloned(self):
|
|
if not os.path.exists(self.local_path):
|
|
self.log.debug("Cloning from %s to %s" % (self.remote_url,
|
|
self.local_path))
|
|
git.Repo.clone_from(self.remote_url, self.local_path)
|
|
|
|
def reset(self):
|
|
self.log.debug("Resetting repository %s" % self.local_path)
|
|
origin = self.repo.remotes.origin
|
|
origin.update()
|
|
# If the remote repository is repacked, the repo object's
|
|
# cache may be out of date. Specifically, it caches whether
|
|
# to check the loose or packed DB for a given SHA. Further,
|
|
# if there was no pack or lose directory to start with, the
|
|
# repo object may not even have a database for it. Avoid
|
|
# these problems by recreating the repo object.
|
|
self.repo = git.Repo(self.local_path)
|
|
for ref in origin.refs:
|
|
if ref.remote_head == 'HEAD':
|
|
continue
|
|
self.repo.create_head(ref.remote_head, ref, force=True)
|
|
|
|
# Reset to remote HEAD (usually origin/master)
|
|
self.repo.head.reference = origin.refs['HEAD']
|
|
self.repo.head.reset(index=True, working_tree=True)
|
|
self.repo.git.clean('-x', '-f', '-d')
|
|
|
|
def checkout(self, branch):
|
|
self.log.debug("Checking out %s" % branch)
|
|
self.repo.head.reference = self.repo.heads[branch]
|
|
self.repo.head.reset(index=True, working_tree=True)
|
|
|
|
def cherryPick(self, ref):
|
|
self.log.debug("Cherry-picking %s" % ref)
|
|
self.fetch(ref)
|
|
self.repo.git.cherry_pick("FETCH_HEAD")
|
|
|
|
def merge(self, ref):
|
|
self.log.debug("Merging %s" % ref)
|
|
self.fetch(ref)
|
|
self.repo.git.merge("FETCH_HEAD")
|
|
|
|
def fetch(self, ref):
|
|
# The git.remote.fetch method may read in git progress info and
|
|
# interpret it improperly causing an AssertionError. Because the
|
|
# data was fetched properly subsequent fetches don't seem to fail.
|
|
# So try again if an AssertionError is caught.
|
|
origin = self.repo.remotes.origin
|
|
try:
|
|
origin.fetch(ref)
|
|
except AssertionError:
|
|
origin.fetch(ref)
|
|
|
|
# If the repository is packed, and we fetch a change that is
|
|
# also entirely packed, the cache may be out of date for the
|
|
# same reason as reset() above. Avoid these problems by
|
|
# recreating the repo object.
|
|
# https://bugs.launchpad.net/zuul/+bug/1078946
|
|
self.repo = git.Repo(self.local_path)
|
|
|
|
def createZuulRef(self, ref):
|
|
ref = ZuulReference.create(self.repo, ref, 'HEAD')
|
|
return ref
|
|
|
|
def setZuulRef(self, ref, commit):
|
|
self.repo.refs[ref].commit = commit
|
|
return self.repo.refs[ref].commit
|
|
|
|
def push(self, local, remote):
|
|
self.log.debug("Pushing %s:%s to %s " % (local, remote,
|
|
self.remote_url))
|
|
self.repo.remotes.origin.push('%s:%s' % (local, remote))
|
|
|
|
|
|
class Merger(object):
|
|
log = logging.getLogger("zuul.Merger")
|
|
|
|
def __init__(self, trigger, working_root, push_refs, sshkey):
|
|
self.trigger = trigger
|
|
self.repos = {}
|
|
self.working_root = working_root
|
|
if not os.path.exists(working_root):
|
|
os.makedirs(working_root)
|
|
self.push_refs = push_refs
|
|
if sshkey:
|
|
self._makeSSHWrapper(sshkey)
|
|
|
|
def _makeSSHWrapper(self, key):
|
|
name = os.path.join(self.working_root, '.ssh_wrapper')
|
|
fd = open(name, 'w')
|
|
fd.write('#!/bin/bash\n')
|
|
fd.write('ssh -i %s $@\n' % key)
|
|
fd.close()
|
|
os.chmod(name, 0755)
|
|
os.environ['GIT_SSH'] = name
|
|
|
|
def addProject(self, project, url):
|
|
try:
|
|
path = os.path.join(self.working_root, project.name)
|
|
repo = Repo(url, path)
|
|
self.repos[project] = repo
|
|
except:
|
|
self.log.exception("Unable to initialize repo for %s" % project)
|
|
|
|
def getRepo(self, project):
|
|
return self.repos.get(project, None)
|
|
|
|
def mergeChanges(self, changes, target_ref=None, mode=None):
|
|
projects = {}
|
|
commit = None
|
|
# Reset all repos involved in the change set
|
|
for change in changes:
|
|
branches = projects.get(change.project, [])
|
|
repo = self.getRepo(change.project)
|
|
if not repo:
|
|
self.log.error("Unable to find repo for %s" %
|
|
change.project)
|
|
return False
|
|
if not branches:
|
|
# First time this repo has come up in this change list
|
|
try:
|
|
repo.reset()
|
|
except:
|
|
self.log.exception("Unable to reset repo %s" % repo)
|
|
return False
|
|
if change.branch not in branches:
|
|
if target_ref:
|
|
repo.createZuulRef(change.branch + '/' + target_ref)
|
|
branches.append(change.branch)
|
|
projects[change.project] = branches
|
|
|
|
# Merge all the changes
|
|
for change in changes:
|
|
repo = self.getRepo(change.project)
|
|
try:
|
|
repo.checkout(change.branch)
|
|
except:
|
|
self.log.exception("Unable to checkout %s" % change.branch)
|
|
return False
|
|
|
|
try:
|
|
if not mode:
|
|
mode = change.project.merge_mode
|
|
if mode == model.MERGE_IF_NECESSARY:
|
|
repo.merge(change.refspec)
|
|
elif mode == model.CHERRY_PICK:
|
|
repo.cherryPick(change.refspec)
|
|
except:
|
|
# Log exceptions at debug level because they are
|
|
# usually benign merge conflicts
|
|
self.log.debug("Unable to merge %s" % change, exc_info=True)
|
|
return False
|
|
|
|
try:
|
|
# Keep track of the last commit, it's the commit that
|
|
# will be passed to jenkins because it's the commit
|
|
# for the triggering change
|
|
zuul_ref = change.branch + '/' + target_ref
|
|
commit = repo.setZuulRef(zuul_ref, 'HEAD').hexsha
|
|
except:
|
|
self.log.exception("Unable to set zuul ref %s for change %s" %
|
|
(zuul_ref, change))
|
|
return False
|
|
|
|
if self.push_refs:
|
|
# Push the results upstream to the zuul ref
|
|
for project, branches in projects.items():
|
|
repo = self.getRepo(project)
|
|
for branch in branches:
|
|
ref = 'refs/zuul/' + branch + '/' + target_ref
|
|
try:
|
|
repo.push(ref, ref)
|
|
complete = self.trigger.waitForRefSha(project, ref)
|
|
except:
|
|
self.log.exception("Unable to push %s" % ref)
|
|
return False
|
|
if not complete:
|
|
self.log.error("Ref %s did not show up in repo" % ref)
|
|
return False
|
|
|
|
return commit
|