Skip to content

Provide git metadata for junit #4382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Provide git metadata for junit #4382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ orbs:

datadog-ci version

DD_ENV=ci DATADOG_API_KEY=$JUNIT_UPLOAD_API_KEY DATADOG_SITE=datadoghq.com datadog-ci junit upload --verbose --service dd-trace-rb tmp/rspec/
DD_ENV=ci DATADOG_API_KEY=$JUNIT_UPLOAD_API_KEY DATADOG_SITE=datadoghq.com datadog-ci junit upload --dry-run --verbose --service dd-trace-rb tmp/rspec/
- store_test_results:
path: tmp/rspec
- persist_to_workspace:
Expand Down
28 changes: 17 additions & 11 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,12 +1620,17 @@ jobs:
name: upload/junit
if: "!cancelled()"
runs-on: ubuntu-24.04
env:
DD_APP_KEY: "${{ secrets.DD_APP_KEY }}"
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
DD_ENV: ci
DATADOG_SITE: datadoghq.com
DD_SERVICE: dd-trace-rb
container:
image: datadog/ci
credentials:
username: "${{ secrets.DOCKERHUB_USERNAME }}"
password: "${{ secrets.DOCKERHUB_TOKEN }}"
env:
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
DD_ENV: ci
DATADOG_SITE: datadoghq.com
DD_SERVICE: dd-trace-rb
DD_GIT_REPOSITORY_URL: "${{ github.repositoryUrl }}"
needs:
- build-test-ruby-34
- build-test-ruby-33
Expand All @@ -1639,18 +1644,19 @@ jobs:
- build-test-jruby-93
- build-test-jruby-92
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: |
curl -L --fail --retry 5 https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 --output /usr/local/bin/datadog-ci
chmod +x /usr/local/bin/datadog-ci
- run: mkdir -p tmp/rspec && datadog-ci version
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
path: tmp/rspec
pattern: junit-*
merge-multiple: true
- run: sed -i 's;file="./;file=";g' tmp/rspec/*.xml
- run: datadog-ci junit upload --verbose --dry-run tmp/rspec/
- if: github.event_name == 'pull_request'
run: echo "DD_GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
- if: github.event_name != 'pull_request'
run: echo "DD_GIT_COMMIT_SHA=${{ github.sha }}" >> $GITHUB_ENV
- run: echo $DD_GIT_COMMIT_SHA
- run: datadog-ci junit upload --verbose tmp/rspec/
coverage:
name: upload/coverage
runs-on: ubuntu-24.04
Expand Down
51 changes: 23 additions & 28 deletions tasks/github.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,36 +289,22 @@ namespace :github do
'name' => 'upload/junit',
'if' => '!cancelled()',
'runs-on' => ubuntu,
'env' => {
'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
'DD_ENV' => 'ci',
'DATADOG_SITE' => 'datadoghq.com',
'DD_SERVICE' => 'dd-trace-rb',
'container' => {
'image' => 'datadog/ci',
'credentials' => {
'username' => '${{ secrets.DOCKERHUB_USERNAME }}',
'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
},
'env' => {
'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
'DD_ENV' => 'ci',
'DATADOG_SITE' => 'datadoghq.com',
'DD_SERVICE' => 'dd-trace-rb',
'DD_GIT_REPOSITORY_URL' => '${{ github.repositoryUrl }}',
}
},
# 'container' => {
# 'image' => 'datadog/ci',
# 'credentials' => {
# 'username' => '${{ secrets.DOCKERHUB_USERNAME }}',
# 'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
# },
# 'env' => {
# 'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
# 'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
# 'DD_ENV' => 'ci',
# 'DATADOG_SITE' => 'datadoghq.com',
# 'DD_SERVICE' => 'dd-trace-rb',
# }
# },
'needs' => runtimes.map(&:build_test_id),
'steps' => [
{ 'uses' => 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' },
{
'run' => <<~BASH
curl -L --fail --retry 5 https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 --output /usr/local/bin/datadog-ci
chmod +x /usr/local/bin/datadog-ci
BASH
},
{ 'run' => 'mkdir -p tmp/rspec && datadog-ci version' },
{
'uses' => 'actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16',
Expand All @@ -329,7 +315,16 @@ namespace :github do
}
},
{ 'run' => "sed -i 's;file=\"\.\/;file=\";g' tmp/rspec/*.xml" },
{ 'run' => 'datadog-ci junit upload --verbose --dry-run tmp/rspec/' },
{
'if' => "github.event_name == 'pull_request'",
'run' => 'echo "DD_GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV'
},
{
'if' => "github.event_name != 'pull_request'",
'run' => 'echo "DD_GIT_COMMIT_SHA=${{ github.sha }}" >> $GITHUB_ENV'
},
{ 'run' => 'echo $DD_GIT_COMMIT_SHA' },
{ 'run' => 'datadog-ci junit upload --verbose tmp/rspec/' },
]
},
'coverage' => {
Expand Down
Loading