Skip to content

[QA-347] Sync submodules recursively. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2022
Merged

[QA-347] Sync submodules recursively. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion master/buildbot/steps/source/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ def computeSourceRevision(self, changes):
def _syncSubmodule(self, _=None):
rc = RC_SUCCESS
if self.submodules:
rc = yield self._dovccmd(['submodule', 'sync'])
rc = yield self._dovccmd(['submodule', 'sync', '--recursive'])
return rc

@defer.inlineCallbacks
Expand Down
16 changes: 8 additions & 8 deletions master/buildbot/test/unit/steps/test_source_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,7 @@ def test_mode_full_clean_submodule(self):
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'update', '--init', '--recursive'])
Expand Down Expand Up @@ -1467,7 +1467,7 @@ def test_mode_full_clean_submodule_remotes(self):
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'update', '--init', '--recursive', '--remote'])
Expand Down Expand Up @@ -2105,7 +2105,7 @@ def test_mode_full_fresh_submodule(self):
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'update', '--init', '--recursive'])
Expand Down Expand Up @@ -2157,7 +2157,7 @@ def test_mode_full_fresh_submodule_git_newer_1_7_6(self):
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'update', '--init', '--recursive', '--force'])
Expand Down Expand Up @@ -2211,7 +2211,7 @@ def test_mode_full_fresh_submodule_v1_7_8(self):
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='wkdir',
command=['git', 'submodule', 'update', '--init', '--recursive',
Expand Down Expand Up @@ -3632,7 +3632,7 @@ def test_mode_full_copy_recursive(self):
command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
+ 0,
ExpectShell(workdir='source',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='source',
command=['git', 'submodule', 'update', '--init', '--recursive'])
Expand Down Expand Up @@ -3752,7 +3752,7 @@ def test_mode_full_copy_recursive_fetch_fail_retry_succeed(self):
+ 0,

ExpectShell(workdir='source',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,

ExpectShell(workdir='source',
Expand Down Expand Up @@ -3811,7 +3811,7 @@ def test_mode_full_copy_recursive_fetch_fail_clobberOnFailure(self):
command=['git', 'submodule', 'update', '--init', '--recursive'])
+ 0,
ExpectShell(workdir='source',
command=['git', 'submodule', 'sync'])
command=['git', 'submodule', 'sync', '--recursive'])
+ 0,
ExpectShell(workdir='source',
command=['git', 'submodule', 'update', '--init', '--recursive'])
Expand Down