Clean up old CI reports (#8753)

* fix(ci): Clean up old reports

* fix(ci): Stop reporting test result to staging

Test results are now reported to production

Author: PerfectSlayer

.circleci/upload_ciapp.sh

@@ -33,10 +33,5 @@ junit_upload() {
         ./results
 }
 
-# Make sure we do not use DATADOG_API_KEY from the environment
-unset DATADOG_API_KEY
-
 # Upload test results to production environment like all other CI jobs
 junit_upload "$DATADOG_API_KEY_PROD"
-# And also upload to staging environment to benefit from the new features not yet released
-junit_upload "$DATADOG_API_KEY_DDSTAGING"

.github/workflows/README.md

@@ -110,7 +110,6 @@ _Trigger:_ When pushing commits to `master` or any pull request targeting `maste
 
 _Action:_
 
-* Run [DataDog Static Analysis](https://docs.datadoghq.com/static_analysis/) and upload result to DataDog Code Analysis,
 * Run [GitHub CodeQL](https://codeql.github.com/) action, upload result to GitHub security tab -- do not apply to pull request, only when pushing to `master`,
 * Run [Trivy security scanner](https://github.com/aquasecurity/trivy) on built artifacts and upload result to GitHub security tab and Datadog Code Analysis.
 

.github/workflows/analyze-changes.yaml

@@ -13,25 +13,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  datadog-static-analyzer:
-    name: Analyze changes with DataDog Static Analyzer
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-        with:
-          submodules: 'recursive'
-      # Run the static analysis on the staging environment to benefit from the new features not yet released
-      - name: Check code meets quality standards (staging)
-        id: datadog-static-analysis-staging
-        uses: DataDog/datadog-static-analyzer-github-action@2707598b1182dce1d1792186477b5b4132338e1c # v1
-        with:
-          dd_app_key: ${{ secrets.DATADOG_APP_KEY_STAGING }}
-          dd_api_key: ${{ secrets.DATADOG_API_KEY_STAGING }}
-          dd_site: "datad0g.com"
-          cpu_count: 2
-          enable_performance_statistics: false
-
   codeql:
     name: Analyze changes with GitHub CodeQL
     # Don’t run on PR, only when pushing to master
@@ -78,24 +59,6 @@ jobs:
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
         uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
 
-      # For now, CodeQL SARIF results are not supported by Datadog CI
-      # - name: Upload results to Datadog CI Static Analysis
-      #   run: |
-      #     wget --no-verbose https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 -O datadog-ci
-      #     chmod +x datadog-ci
-      #     ./datadog-ci sarif upload /home/runner/work/dd-trace-java/results/java.sarif --service dd-trace-java --env ci
-      #   env:
-      #     DD_API_KEY: ${{ secrets.DATADOG_APP_KEY_PROD }}
-      #     DD_SITE: datadoghq.com
-
-      # For now, CodeQL SARIF results are not supported by Datadog CI
-      # - name: Upload results to Datadog Staging CI Static Analysis
-      #   run: |
-      #     ./datadog-ci sarif upload /home/runner/work/dd-trace-java/results/java.sarif --service dd-trace-java --env ci
-      #   env:
-      #     DD_API_KEY: ${{ secrets.DATADOG_API_KEY_STAGING }}
-      #     DD_SITE: datad0g.com
-
   trivy:
     name: Analyze changes with Trivy
     runs-on: ubuntu-latest
@@ -170,10 +133,3 @@ jobs:
         env:
           DD_API_KEY: ${{ secrets.DATADOG_API_KEY_PROD }}
           DD_SITE: datadoghq.com
-
-      - name: Upload results to Datadog Staging CI Static Analysis
-        run: |
-          ./datadog-ci sarif upload trivy-results.sarif --service dd-trace-java --env ci
-        env:
-          DD_API_KEY: ${{ secrets.DATADOG_API_KEY_STAGING }}
-          DD_SITE: datad0g.com

.gitlab-ci.yml

@@ -42,7 +42,6 @@ default:
 
 .set_datadog_api_keys: &set_datadog_api_keys
   - export DATADOG_API_KEY_PROD=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.DATADOG_API_KEY_PROD --with-decryption --query "Parameter.Value" --out text)
-  - export DATADOG_API_KEY_DDSTAGING=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.dd_api_key --with-decryption --query "Parameter.Value" --out text)
 
 # CI_NODE_INDEX and CI_NODE_TOTAL are 1-indexed and not always set. These steps normalize the numbers for jobs
 .normalize_node_index: &normalize_node_index