phase1: deduplicate 'git' step

method renderers are supported now.

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index ecd06a131187d590cab1ddbfe65510ec90dce1ca..10fd530f0a13fff2f003c15a369ee063e24449fd 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -397,16 +397,6 @@ def IsExpireRequested(step):
        else:
                return not IsCleanupRequested(step)
 
-def IsGitFreshRequested(step):
-       do_cleanup = step.getProperty("do_cleanup")
-       if do_cleanup:
-               return True
-       else:
-               return False
-
-def IsGitCleanRequested(step):
-       return not IsGitFreshRequested(step)
-
 def IsTaggingRequested(step):
        val = step.getProperty("tag")
        if val and re.match(r"^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", val):
@@ -658,28 +648,14 @@ for target in targets:
          # if repo doesn't exist: 'git clone repourl'
          # method 'clean' runs 'git clean -d -f', method fresh runs 'git clean -d -f x'. Only works with mode='full'
          # 'git fetch -t repourl branch; git reset --hard revision'
-       # Git() parameters can't take a renderer until buildbot 0.8.10, so we have to split the fresh and clean cases
-       # if buildbot is updated, one can use: method = Interpolate('%(prop:do_cleanup:#?|fresh|clean)s')
-       factory.addStep(Git(
-               name = "gitclean",
-               repourl = repo_url,
-               branch = repo_branch,
-               mode = 'full',
-               method = 'clean',
-               locks = NetLockDl,
-               haltOnFailure = True,
-               doStepIf = IsGitCleanRequested,
-       ))
-
        factory.addStep(Git(
-               name = "gitfresh",
+               name = "git",
                repourl = repo_url,
                branch = repo_branch,
                mode = 'full',
-               method = 'fresh',
+               method = Interpolate("%(prop:do_cleanup:#?|fresh|clean)s"),
                locks = NetLockDl,
                haltOnFailure = True,
-               doStepIf = IsGitFreshRequested,
        ))
 
        # update remote refs