phase1: switch away from deprecated slave side Git step

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 2ae92f1aef76e57cf350663a9a45e55e9bf5b4e3..bbed0543df32a53d4731cfc1052e8ca80474445a 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -147,7 +147,7 @@ c['schedulers'].append(ForceScheduler(
 # only take place on one slave.
 
 from buildbot.process.factory import BuildFactory
 # only take place on one slave.
 
 from buildbot.process.factory import BuildFactory

-from buildbot.steps.source import Git
+from buildbot.steps.source.git import Git

 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import SetProperty
 from buildbot.steps.transfer import FileUpload
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import SetProperty
 from buildbot.steps.transfer import FileUpload


@@ -274,7 +274,11 @@ for target in targets:
                ))
 
        # check out the source
                ))
 
        # check out the source

-       factory.addStep(Git(repourl=repo_url, branch=repo_branch, mode='update'))
+       factory.addStep(Git(
+               repourl = repo_url,
+               branch = repo_branch,
+               mode = 'incremental',
+               method = 'clean'))

 
        factory.addStep(ShellCommand(
                name = "rmtmp",
 
        factory.addStep(ShellCommand(
                name = "rmtmp",