Skip to content
This repository was archived by the owner on May 21, 2025. It is now read-only.

update codecov client for Gitlab-CI 9+ #97

Closed
althonos wants to merge 2 commits into from
Closed

update codecov client for Gitlab-CI 9+ #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68bde36
update codecov client for Gitlab-CI 9+
Apr 25, 2017
7e70d47
fix tests for gitlab 8 and add tests for gitlab 9
Apr 26, 2017
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
24 changes: 17 additions & 7 deletions codecov/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,19 +464,29 @@ def main(*argv, **kwargs):
# ---------
# Gitlab CI
# ---------
elif os.getenv('CI_SERVER_NAME', '').startswith("GitLab"):
elif os.getenv('CI') == 'true' and os.getenv('GITLAB_CI') == 'true':
# http://doc.gitlab.com/ci/examples/README.html#environmental-variables
# https://gitlab.com/gitlab-org/gitlab-ci-runner/blob/master/lib/build.rb#L96
query.update(dict(service='gitlab',
branch=os.getenv('CI_BUILD_REF_NAME'),
build=os.getenv('CI_BUILD_ID'),
slug=os.getenv('CI_BUILD_REPO').split('/', 3)[-1].replace('.git', ''),
commit=os.getenv('CI_BUILD_REF')))

# Gitlab Runner v8.9-
if int(os.getenv('CI_SERVER_VERSION', '8.9').split('.')[0]) <= 8:
query.update(dict(service='gitlab',
branch=os.getenv('CI_BUILD_REF_NAME'),
build=os.getenv('CI_BUILD_ID'),
slug=os.getenv('CI_BUILD_REPO').split('/', 3)[-1].replace('.git', ''),
commit=os.getenv('CI_BUILD_REF')))
# Gitlab Runner v9+
else:
query.update(dict(service='gitlab',
branch=os.getenv('CI_COMMIT_REF_NAME'),
build=os.getenv('CI_JOB_ID'),
slug=os.getenv('CI_REPOSITORY_URL').split('/', 3)[-1].replace('.git', ''),
commit=os.getenv('CI_COMMIT_SHA')))

if os.getenv('CI_PROJECT_DIR', '').startswith('/'):
root = os.getenv('CI_PROJECT_DIR')
else:
root = os.getenv('HOME') + '/' + os.getenv('CI_PROJECT_DIR', '')

write(' Gitlab CI Detected')

else:
Expand Down
26 changes: 24 additions & 2 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,10 @@ def test_ci_magnum(self):
self.assertEqual(res['query']['build'], '1399372237')
self.assertEqual(res['codecov'].token, 'token')

def test_ci_gitlab(self):
self.set_env(CI_BUILD_REF_NAME='master',
def test_ci_gitlab_8(self):
self.set_env(CI='true',
GITLAB_CI='true',
CI_BUILD_REF_NAME='master',
CI_BUILD_ID='1399372237',
CI_BUILD_REPO='https://gitlab.com/owner/repo.git',
CI_SERVER_NAME='GitLab CI',
Expand All @@ -560,6 +562,26 @@ def test_ci_gitlab(self):
self.assertEqual(res['query']['slug'], 'owner/repo')
self.assertEqual(res['codecov'].token, 'token')

def test_ci_gitlab_9(self):
self.set_env(CI='true',
GITLAB_CI='true',
CI_SERVER_VERSION='9.0',
CI_COMMIT_REF_NAME='master',
CI_JOB_ID='1399372237',
CI_REPOSITORY_URL='https://gitlab.com/owner/repo.git',
CI_SERVER_NAME='GitLab CI',
CI_COMMIT_SHA='d653b934ed59c1a785cc1cc79d08c9aaa4eba73b',
HOME='/',
CI_PROJECT_DIR=os.getcwd().strip('/'),
CODECOV_TOKEN='token')
self.fake_report()
res = self.run_cli()
self.assertEqual(res['query']['service'], 'gitlab')
self.assertEqual(res['query']['commit'], 'd653b934ed59c1a785cc1cc79d08c9aaa4eba73b')
self.assertEqual(res['query']['build'], '1399372237')
self.assertEqual(res['query']['slug'], 'owner/repo')
self.assertEqual(res['codecov'].token, 'token')

def test_ci_none(self):
self.set_env(CODECOV_TOKEN='token')
self.fake_report()
Expand Down