[yocto] [AB PATCH 08/27] CheckOutLayers.py/ResolveLayerHead.py: support simplified git

[Elizabeth Flanagan]

From: Beth Flanagan <elizabeth.flanagan at intel.com>

As the parser now no longer has complex git information properties
this simplifies the code needed to resolve FETCH_HEAD's git hash
and checkout layers.

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
---
 .../autobuilder/buildsteps/CheckOutLayers.py       | 21 +++++------------
 .../autobuilder/buildsteps/ResolveLayerHead.py     | 26 +++++-----------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
index 2ffb3b2..d56143b 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckOutLayers.py
@@ -58,7 +58,7 @@ class CheckOutLayers(YoctoGit):
         self.timeout = 100000
         self.getDescription = getDescription
         self.layername = layername
-        self.name="Git checkout of " + layername + " " + self.repourl + " " + self.workdir
+        self.name="Git checkout of " + layername
         kwargs['timeout']=self.timeout
         for k, v in argdict.iteritems():
             setattr(self, k, v)
@@ -69,25 +69,16 @@ class CheckOutLayers(YoctoGit):
                  getDescription=self.getDescription, layername=self.layername, **kwargs)
 
     def startVC(self, branch, revision, patch):
-        if self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler):
-            self.branch = self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.branch = self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_'+self.layername):
+        if self.getProperty('branch_'+self.layername):
             self.branch = self.getProperty('branch_'+self.layername)
         else:
             self.branch = "master"
-        if self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler):
-            self.repourl = self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.repourl = self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_'+self.layername):
+        if self.getProperty('repo_'+self.layername):
             self.repourl = self.getProperty('repo_'+self.layername)
-        else:self.repourl = "git://git.yoctoproject.org/poky"
+        else:
+            self.repourl = "git://git.yoctoproject.org/poky"
 
-        if self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler) == "HEAD" and \
-           self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('triggers_repo_'+self.layername) and \
-           self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('triggers_branch_'+self.layername) and \
+        if self.getProperty('commit_'+self.layername) == "HEAD" and \
            self.getProperty('commit_resolvedhead_'+self.layername) is not None:
             log.msg("Using Resolved HEAD")
             self.commit = self.getProperty('commit_resolvedhead_'+self.layername)
diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/ResolveLayerHead.py b/lib/python2.7/site-packages/autobuilder/buildsteps/ResolveLayerHead.py
index c1c6605..88b12bf 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/ResolveLayerHead.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/ResolveLayerHead.py
@@ -31,34 +31,18 @@ class ResolveLayerHead(ShellCommand):
         ShellCommand.__init__(self, **kwargs)
 
     def start(self):
-        if self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler):
-            self.branch = self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.branch = self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_'+self.layername):
+        if self.getProperty('branch_'+self.layername):
             self.branch = self.getProperty('branch_'+self.layername)
         else:
             self.branch = "master"
 
-        if self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler):
-            self.repourl = self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.repourl = self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_'+self.layername):
+        if self.getProperty('repo_'+self.layername):
             self.repourl = self.getProperty('repo_'+self.layername)
-        else:self.repourl = "git://git.yoctoproject.org/poky"
+        else:
+            self.repourl = "git://git.yoctoproject.org/poky"
 
-        if self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler) == "HEAD" and \
-           self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('repo_'+self.layername) and \
-           self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('branch_'+self.layername) and \
-           self.getProperty('commit_resolvedhead_'+self.layername) is not None:
+        if self.getProperty('commit_resolvedhead_'+self.layername) is not None:
             self.commit = self.getProperty('commit_resolvedhead_'+self.layername)
-        elif self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler):
-            self.commit = self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('commit_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.commit = self.getProperty('commit_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('commit_'+self.layername):
-            self.commit = self.getProperty('commit_'+self.layername)
         else:
             self.commit = "HEAD"
         if self.commit == "HEAD":
-- 
1.8.1.2