Merge lp:~vauxoo/openerp-tools/openerprunbot-custom_sticky_branch-dev-moylop260 into lp:openerp-tools

[Moisés López - http://www.vauxoo.com]

IMP for add custom sticky branch with only named of group branch.
IMP for add merge proposal branch of custom sticky branches.

[lp:~vauxoo/openerp-tools/openerprunbot-custom_sticky_branch-dev-moylop260]

262. By Moisés López - http://www.vauxoo.com on 2013-10-27

[REF] Add custom sticky branches for server & addons

263. By Moisés López - http://www.vauxoo.com on 2013-10-28

[IMP] Add runbot group branch for Merge Proposal of sticky branches (only web) ToDo: Server & addons

264. By Moisés López - http://www.vauxoo.com on 2013-10-28

[IMP] Add runbot group branch for Merge Proposal of sticky branches (now addons & server)

265. By Moisés López - http://www.vauxoo.com on 2013-10-28

[FIX] Add process comma modules with stickty branches

266. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Refactory to extract merge proposal number

267. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add modules to install if merge proposal modify a module plus modules is set

268. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add last MP numbers

269. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add reason_ok to particular branch

270. By Moisés López - http://www.vauxoo.com on 2013-10-29

[FIX] Variable not assigned

271. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add reason_ok to sticky branches

Unmerged revisions

271. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add reason_ok to sticky branches

270. By Moisés López - http://www.vauxoo.com on 2013-10-29

[FIX] Variable not assigned

269. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add reason_ok to particular branch

268. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add last MP numbers

267. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Add modules to install if merge proposal modify a module plus modules is set

266. By Moisés López - http://www.vauxoo.com on 2013-10-29

[REF] Refactory to extract merge proposal number

265. By Moisés López - http://www.vauxoo.com on 2013-10-28

[FIX] Add process comma modules with stickty branches

264. By Moisés López - http://www.vauxoo.com on 2013-10-28

[IMP] Add runbot group branch for Merge Proposal of sticky branches (now addons & server)

263. By Moisés López - http://www.vauxoo.com on 2013-10-28

[IMP] Add runbot group branch for Merge Proposal of sticky branches (only web) ToDo: Server & addons

262. By Moisés López - http://www.vauxoo.com on 2013-10-27

[REF] Add custom sticky branches for server & addons

=== modified file 'openerp-runbot/openerprunbot/core.py'
--- openerp-runbot/openerprunbot/core.py	2013-10-06 13:33:20 +0000
+++ openerp-runbot/openerprunbot/core.py	2013-10-29 19:09:28 +0000
@@ -84,6 +84,7 @@
         self.committer_name = None
         self.committer_xgram = None
         self.committer_email = None
+        self.reason_ok = False
 
     def age(self):
         return time.time()-int(self.local_date_last_modified.strftime("%s"))
@@ -97,6 +98,8 @@
             if self.trigger_build:
                 name = self.project_name
                 self.group.need_run_reason.append(name)
+                self.group.set_reason_ok( False, False )
+                self.group.set_reason_ok( branch.unique_name, True )
 
 #----------------------------------------------------------
 # OpenERP RunBot Grouped Branch
@@ -199,7 +202,8 @@
             # Don't change stickiness for the hard-coded branches.
             return
         previous = self.sticky
-        self.sticky = state.get(self.team_name, {}).get(self.name, {}).get('sticky', False)
+        default_sticky = "stick" in self.name
+        self.sticky = state.get(self.team_name, {}).get(self.name, {}).get('sticky', default_sticky)
         if self.sticky != previous:
             log("stickiness changed", team=self.team_name, branch=self.name, now=self.sticky)
 
@@ -317,6 +321,12 @@
         elif not self.addons[0].trigger_build:
             b = self.runbot.main_branches['addons'+ending]
             self.addons[0].update_launchpad(b)
+    
+    def set_reason_ok(self, unique_name, reason_ok):
+        #unique_name=False set all reason_ok
+        for branch in self.all_branches():
+            if branch and (branch.unique_name == unique_name or not unique_name):
+                branch.reason_ok = reason_ok
 
 #----------------------------------------------------------
 # OpenERP RunBot Engine
@@ -506,7 +516,8 @@
             if self.quit: return
             for name, c in v.items():
                 if not name: continue
-                g = RunBotGroupedBranch(self, team, name, c['version'], 0,
+                default_sticky = 'stick' in name
+                g = RunBotGroupedBranch(self, team, name, c['version'], default_sticky,
                     server_branch=c['server_branch'],
                     client_web_branch=c.get('client_web_branch'),
                     web_branch=c.get('web_branch'),
@@ -575,6 +586,127 @@
             if self.quit: return []
             if not g.configured:
                 g.add_main_branches()
+            if 'stick' in g.name:
+                if g.web_branch:
+                    log("launchpad update custom sticky web branch " + g.web_branch)
+                    b = g.runbot.launchpad.get_branch(unique_name = g.web_branch)
+                    if not b:
+                        log("WARNING:no such unique name", name = g.web_branch)
+                    else:
+                        g.web.update_launchpad( b )
+                        #Start check Merge Proposal##TODO: IMP this for generate a new function
+                        filters = {'status': NEW_MERGE_STATUS}
+                        merge_proposals = b.getMergeProposals(**filters)#TODO: IMP this for extract more recent MP (-2 months) with params merge_proposal.date_created
+                        mp_number__mp_obj = dict([(merge_proposal.web_link.split('/')[-1], merge_proposal) for merge_proposal in merge_proposals])
+                        mp_numbers_sort = sorted(  mp_number__mp_obj.keys(), reverse=True )
+                        for mp_number in mp_numbers_sort[:15]:#last MP
+                            merge_proposal = mp_number__mp_obj[ mp_number ]
+                            new_web_branch = merge_proposal.source_branch.unique_name
+                            new_name = g.name.replace('sticky', '').replace('stick', '') + '-web-mp-'+mp_number
+                            if (g.team_name, new_name) not in self.groups:
+                                new_rbgb = RunBotGroupedBranch(self, g.team_name, new_name, g.version, 0,
+                                    server_branch=g.server_branch,
+                                    client_web_branch=new_web_branch,#g.web_branch,
+                                    web_branch=new_web_branch,#g.web_branch,
+                                    addons_branches=g.addons_branches,
+                                    modules = ','.join( g.modules ), job_type=g.job_type)
+                                
+                                new_rbgb.configure_branches(self.launchpad)
+                                new_rbgb.set_reason_ok(new_web_branch, True)
+
+                                if new_rbgb.is_ok():
+                                    log("adding configured group", team=new_rbgb.team_name, name=new_name)
+                                    self.groups[(new_rbgb.team_name, new_name)] = new_rbgb
+                                else:
+                                    log("WARNING: misconfigured group", team=new_rbgb.team_name, name=new_name)
+                         #End check Merge Proposal
+                if g.server_branch:
+                    log("launchpad update custom sticky server branch " + g.server_branch)
+                    b = g.runbot.launchpad.get_branch(unique_name = g.server_branch)
+                    if not b:
+                        log("WARNING:no such unique name", name = g.server_branch)
+                    else:
+                        g.server.update_launchpad( b )
+
+                        #Start check Merge Proposal##TODO: IMP this for generate a new function
+                        filters = {'status': NEW_MERGE_STATUS}
+                        merge_proposals = b.getMergeProposals(**filters)#TODO: IMP this for extract more recent MP (-2 months) with params merge_proposal.date_created
+                        
+                        mp_number__mp_obj = dict([(merge_proposal.web_link.split('/')[-1], merge_proposal) for merge_proposal in merge_proposals])
+                        mp_numbers_sort = sorted(  mp_number__mp_obj.keys(), reverse=True )
+                        for mp_number in mp_numbers_sort[:15]:#last MP
+                            merge_proposal = mp_number__mp_obj[ mp_number ]
+                            new_server_branch = merge_proposal.source_branch.unique_name
+                            new_name = g.name.replace('sticky', '').replace('stick', '') + '-server-mp-'+mp_number
+                            if (g.team_name, new_name) not in self.groups:
+                                new_rbgb = RunBotGroupedBranch(self, g.team_name, new_name, g.version, 0,
+                                    server_branch=new_server_branch,
+                                    client_web_branch=g.web_branch,
+                                    web_branch=g.web_branch,
+                                    addons_branches=g.addons_branches,
+                                    modules = ','.join( g.modules ), job_type=g.job_type)
+
+                                new_rbgb.configure_branches(self.launchpad)
+                                new_rbgb.set_reason_ok(new_server_branch, True)
+
+                                if new_rbgb.is_ok():
+                                    log("adding configured group", team=new_rbgb.team_name, name=new_name)
+                                    self.groups[(new_rbgb.team_name, new_name)] = new_rbgb
+                                else:
+                                    log("WARNING: misconfigured group", team=new_rbgb.team_name, name=new_name)
+                        #End check Merge Proposal
+                if g.addons:
+                    for addon_rb in g.addons:
+                        log("launchpad update custom sticky addons branch " + addon_rb.unique_name)
+                        b = g.runbot.launchpad.get_branch(unique_name = addon_rb.unique_name)
+                        if not b:
+                            log("WARNING:no such unique name", name = addon_rb.unique_name)
+                        else:
+                            addon_rb.update_launchpad( b )
+
+
+                            #Start check Merge Proposal##TODO: IMP this for generate a new function
+                            filters = {'status': NEW_MERGE_STATUS}
+                            merge_proposals = b.getMergeProposals(**filters)#TODO: IMP this for extract more recent MP (-2 months) with params merge_proposal.date_created
+                            mp_number__mp_obj = dict([(merge_proposal.web_link.split('/')[-1], merge_proposal) for merge_proposal in merge_proposals])
+                            mp_numbers_sort = sorted(  mp_number__mp_obj.keys(), reverse=True )
+                            for mp_number in mp_numbers_sort[:15]:#last MP
+                                merge_proposal = mp_number__mp_obj[ mp_number ]
+                                new_addon_branch = merge_proposal.source_branch.unique_name
+                                new_name = g.name.replace('sticky', '').replace('stick', '') + '-addons-mp-'+mp_number
+                                if (g.team_name, new_name) not in self.groups:
+                                    new_addons_branches = []
+                                    for old_addon_branch in g.addons_branches:
+                                        if old_addon_branch == addon_rb.unique_name:
+                                            unique_name_reason = new_addon_branch
+                                            new_addons_branches.append( new_addon_branch )
+                                        else:
+                                            new_addons_branches.append( old_addon_branch )
+                                    new_modules = ','.join( g.modules )
+                                    if new_modules:
+                                        if not '!' in new_modules:#"!" is for exclude modules. I dont need exclude modules.
+                                            #Check mp diff for add new modules
+                                            preview_diff = merge_proposal.preview_diff
+                                            modules_diff_list = [fname_diff.split('/')[0] for fname_diff in  preview_diff.diffstat.keys() ]
+                                            modules_diff_list = list( set( modules_diff_list ) )
+                                            modules_diff_str = ','.join( modules_diff_list )
+                                            if modules_diff_str:
+                                                new_modules += ',' + modules_diff_str
+                                    new_rbgb = RunBotGroupedBranch(self, g.team_name, new_name, g.version, 0,
+                                        server_branch=g.server_branch,
+                                        client_web_branch=g.web_branch,
+                                        web_branch=g.web_branch,
+                                        addons_branches=new_addons_branches,
+                                        modules = new_modules, job_type=g.job_type)
+                                    new_rbgb.configure_branches(self.launchpad)
+                                    new_rbgb.set_reason_ok(unique_name_reason, True)
+
+                                    if new_rbgb.is_ok():
+                                        log("adding configured group", team=new_rbgb.team_name, name=new_name)
+                                        self.groups[(new_rbgb.team_name, new_name)] = new_rbgb
+                                    else:
+                                        log("WARNING: misconfigured group", team=new_rbgb.team_name, name=new_name)
+                            #End check Merge Proposal
 
         self.checked_date_last_modified = max(x.lp_date_last_modified() for x in self.groups.values())
         self.assign_positions()

=== modified file 'openerp-runbot/openerprunbot/templates/defs.html.mako'
--- openerp-runbot/openerprunbot/templates/defs.html.mako	2013-10-03 15:17:46 +0000
+++ openerp-runbot/openerprunbot/templates/defs.html.mako	2013-10-29 19:09:28 +0000
@@ -1,6 +1,6 @@
 <%def name="rev_(r,g,b,p)">
   <li>
-% if b.project_name in p.need_run_reason:
+% if (b.project_name in p.need_run_reason and False) or b.reason_ok:
   <span class="reason">
 % else:
   <span>