WIP

Author: TonyCTHsu

.github/workflows/test.yml

@@ -1521,16 +1521,11 @@ jobs:
     name: upload/junit
     if: "!cancelled()"
     runs-on: ubuntu-24.04
-    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
+    env:
+      DD_APP_KEY: "${{ secrets.DD_APP_KEY }}"
+      DD_API_KEY: "${{ secrets.DD_API_KEY }}"
+      DD_ENV: ci
+      DATADOG_SITE: datadoghq.com
     needs:
     - build-test-ruby-34
     - build-test-ruby-33
@@ -1544,12 +1539,15 @@ jobs:
     - build-test-jruby-93
     - build-test-jruby-92
     steps:
+    - 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
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-    - run: ls .github
     - 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 --service dd-trace-rb tmp/rspec/

tasks/github.rake

@@ -271,23 +271,31 @@ namespace :github do
             'name' => 'upload/junit',
             'if' => '!cancelled()',
             'runs-on' => ubuntu,
-            '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'
-              }
+            'env' => {
+              'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
+              'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
+              'DD_ENV' => 'ci',
+              'DATADOG_SITE' => 'datadoghq.com'
             },
+            # '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'
+            #   }
+            # },
             'needs' => runtimes.map(&:build_test_id),
             'steps' => [
+              # rubocop:disable Layout/LineLength
+              { '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' },
+              # rubocop:enable Layout/LineLength
               { 'uses' => 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' },
-              { 'run' => 'ls .github' },
               { 'run' => 'mkdir -p tmp/rspec && datadog-ci version' },
               {
                 'uses' => 'actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16',
@@ -297,7 +305,7 @@ namespace :github do
                   'merge-multiple' => true
                 }
               },
-              # { 'run' => "sed -i 's;file=\"\.\/;file=\";g' tmp/rspec/*.xml" },
+              { 'run' => "sed -i 's;file=\"\.\/;file=\";g' tmp/rspec/*.xml" },
               { 'run' => 'datadog-ci junit upload --verbose --service dd-trace-rb tmp/rspec/' },
             ]
           }