ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix Shippable BASE_BRANCH lookup on merges.

Browse source
This commit is contained in:
Matt Clay 2017-05-19 01:51:24 +08:00
parent c4a7f64c02
commit 53180ebb57
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/runner/lib/executor.py
View file

@ -40,7 +40,6 @@ from lib.util import (
ApplicationWarning, ApplicationWarning,
ApplicationError, ApplicationError,
SubprocessError, SubprocessError,
MissingEnvironmentVariable,
display, display,
run_command, run_command,
common_environment, common_environment,
@ -1289,10 +1288,7 @@ class SanityConfig(TestConfig):
if args.base_branch: if args.base_branch:
self.base_branch = args.base_branch # str self.base_branch = args.base_branch # str
elif is_shippable(): elif is_shippable():
try: self.base_branch = os.environ.get('BASE_BRANCH', '') # str
self.base_branch = os.environ['BASE_BRANCH'] # str
except KeyError as ex:
raise MissingEnvironmentVariable(name=ex.args[0])
if self.base_branch: if self.base_branch:
self.base_branch = 'origin/%s' % self.base_branch self.base_branch = 'origin/%s' % self.base_branch