Introduce coverage to PR pipelines #5357
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -46,15 +46,15 @@ local github_secret = secret('github_token', 'infra/data/ci/github/grafanabot', | |||||
| // Injected in a secret because this is a public repository and having the config here would leak our environment names | ||||||
| local deploy_configuration = secret('deploy_config', 'infra/data/ci/loki/deploy', 'config.json'); | ||||||
|
|
||||||
| local run(name, commands, env={}) = { | ||||||
| name: name, | ||||||
| image: 'grafana/loki-build-image:%s' % build_image_version, | ||||||
| commands: commands, | ||||||
| environment: env, | ||||||
| }; | ||||||
|
|
||||||
| local make(target, container=true, args=[]) = run(target, [ | ||||||
| 'make ' + (if !container then 'BUILD_IN_CONTAINER=false ' else '') + target + ' ' + std.join(' ', args), | ||||||
| ]); | ||||||
|
|
||||||
| local docker(arch, app) = { | ||||||
|
|
@@ -345,7 +345,23 @@ local manifest(apps) = pipeline('manifest') { | |||||
| steps: [ | ||||||
| make('check-drone-drift', container=false) { depends_on: ['clone'] }, | ||||||
| make('check-generated-files', container=false) { depends_on: ['clone'] }, | ||||||
| make('test', container=false) { depends_on: ['clone'] }, | ||||||
| run('clone-main', commands=['cd ..', 'git clone $CI_REPO_REMOTE loki-main', 'cd -']), | ||||||
| run('test-main', commands=['cd ../loki-main', 'BUILD_IN_CONTAINER=false make test']) { depends_on: ['clone-main'] }, | ||||||
| make('compare-coverage', container=false, args=[ | ||||||
| 'old=../loki-main/test_results.txt', | ||||||
| 'new=test_results.txt', | ||||||
| 'packages=ingester,distributor,querier,ruler,storage', | ||||||
|
There was a problem hiding this comment.
Suggested change
The ruler is not super critical here, but the There was a problem hiding this comment. I changed the list to these: I think we can be fairly aggressive here because we ought to have color coding to help us see where to focus. There was a problem hiding this comment. I'd like to also add querier/queryrange. There was a problem hiding this comment. does it fail if the package name has changed ? There was a problem hiding this comment. We'd see a large diff, but this won't fail |
||||||
| '> diff.txt', | ||||||
| ]) { depends_on: ['test', 'test-main'] }, | ||||||
| run('report-coverage', commands=[ | ||||||
| "pull=$(echo $CI_COMMIT_REF | awk -F '/' '{print $3}')", | ||||||
| "body=$(jq -Rs '{body: . }' diff.txt)", | ||||||
| 'curl -X POST -u $USER:$TOKEN -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/grafana/loki/issues/$pull/comments -d "$body" > /dev/null', | ||||||
| ], env={ | ||||||
| USER: 'grafanabot', | ||||||
| TOKEN: { from_secret: github_secret.name }, | ||||||
| }) { depends_on: ['compare-coverage'] }, | ||||||
| make('lint', container=false) { depends_on: ['clone', 'check-generated-files'] }, | ||||||
| make('check-mod', container=false) { depends_on: ['clone', 'test', 'lint'] }, | ||||||
| { | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/bin/bash | ||
|
|
||
| if [[ ! -f "$1" ]] || [[ ! -f "$2" ]]; then | ||
| echo "unable to compare test coverage: both old and new files must exist" | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo '```diff' | ||
| for pkg in ${3//,/ }; do | ||
| old=$(grep "pkg/${pkg}\s" "$1" | sed s/%// | awk '{print $5}') | ||
| new=$(grep "pkg/${pkg}\s" "$2" | sed s/%// | awk '{print $5}') | ||
| echo | awk -v pkg="${pkg}" -v old="${old:-0}" -v new="${new:-0}" \ | ||
| '{ | ||
| sign=new - old < 0 ? "-" : "+" | ||
| printf ("%s %11s\t%s\n", sign, pkg, new - old) | ||
| }' | ||
| done | ||
| echo '```' |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will get rid of the unrelated changes in
drone.yml