cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[stable-2.10] Fix Azure Pipelines change detection. (#72824)

Browse source 
(cherry picked from commit 08842cd6bb)

Co-authored-by: Matt Clay <mclay@redhat.com>
This commit is contained in:
Matt Clay 2020-12-03 09:19:03 -08:00 committed by Matt Clay
parent eb4f30cd03
commit 7813b1248b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ansible-test-azp-change-detection.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ansible-test - Correctly detect changes in a GitHub pull request when running on Azure Pipelines.

8
test/lib/ansible_test/_internal/ci/azp.py
View file

@ -208,10 +208,10 @@ class AzurePipelinesChanges:
if self.base_commit: if self.base_commit:
self.base_commit = self.git.run_git(['rev-parse', self.base_commit]).strip() self.base_commit = self.git.run_git(['rev-parse', self.base_commit]).strip()
# <rev1>...<rev2> # <commit>...<commit>
# Include commits that are reachable from <rev2> but exclude those that are reachable from <rev1>. # This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.
# see: https://git-scm.com/docs/gitrevisions # see: https://git-scm.com/docs/git-diff
dot_range = '%s..%s' % (self.base_commit, self.commit) dot_range = '%s...%s' % (self.base_commit, self.commit)
self.paths = sorted(self.git.get_diff_names([dot_range])) self.paths = sorted(self.git.get_diff_names([dot_range]))
self.diff = self.git.get_diff([dot_range]) self.diff = self.git.get_diff([dot_range])