internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki 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
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,
ApplicationError,
SubprocessError,
MissingEnvironmentVariable,
display,
run_command,
common_environment,
@@ -1289,10 +1288,7 @@ class SanityConfig(TestConfig):
if args.base_branch:
self.base_branch = args.base_branch # str
elif is_shippable():
try:
self.base_branch = os.environ['BASE_BRANCH'] # str
except KeyError as ex:
raise MissingEnvironmentVariable(name=ex.args[0])
self.base_branch = os.environ.get('BASE_BRANCH', '') # str
if self.base_branch:
self.base_branch = 'origin/%s' % self.base_branch