diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index 005dfcdd7e7..e9eb1cf3f7f 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -744,79 +744,6 @@ jobs: path: ./reports - display_memory_usage - muzzle-dep-report: - <<: *defaults - resource_class: medium - steps: - - setup_code - - skip_unless_matching_files_changed: - pattern: "dd-java-agent/instrumentation" - - restore_dependency_cache: - cacheType: inst - - restore_build_cache: - cacheType: inst - - run: - name: Generate muzzle dep report - command: >- - SKIP_BUILDSCAN="true" - GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - ./gradlew generateMuzzleReport muzzleInstrumentationReport - - run: - name: Collect Reports - command: .circleci/collect_muzzle_deps.sh - - store_artifacts: - path: ./reports - - muzzle: - <<: *defaults - resource_class: medium+ - parallelism: 4 - steps: - - setup_code - - - skip_unless_matching_files_changed: - pattern: "dd-java-agent/instrumentation" - - # We are not running with a separate cache of all muzzle artifacts here because it gets very big and - # ends up taking more time restoring/saving than the actual increase in time it takes just - # downloading the artifacts each time. - # - # Let's at least restore the build cache to have something to start from. - - restore_dependency_cache: - cacheType: inst - - restore_build_cache: - cacheType: inst - - - run: - name: Gather muzzle tasks - command: >- - SKIP_BUILDSCAN="true" - GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - ./gradlew writeMuzzleTasksToFile - << pipeline.parameters.gradle_flags >> - --max-workers=3 - - - run: - name: Verify Muzzle - command: >- - SKIP_BUILDSCAN="true" - GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - ./gradlew `circleci tests split --split-by=timings workspace/build/muzzleTasks | xargs` - << pipeline.parameters.gradle_flags >> - --max-workers=4 - - - run: - name: Collect Reports - when: on_fail - command: .circleci/collect_reports.sh - - - store_artifacts: - path: ./reports - - - store_test_results: - path: workspace/build/muzzle-test-results - - - display_memory_usage system-tests: machine: @@ -1427,20 +1354,6 @@ build_test_jobs: &build_test_jobs requires: - ok_to_test - - muzzle: - requires: - - ok_to_test - filters: - branches: - ignore: - - master - - project/* - - release/* - - - muzzle-dep-report: - requires: - - ok_to_test - - system-tests: requires: - ok_to_test @@ -1488,7 +1401,6 @@ build_test_jobs: &build_test_jobs - "test_{{ jdk }}" {% endfor %} - test_inst_latest - - muzzle - profiling - debugger - system-tests diff --git a/.github/workflows/all-green.yml b/.github/workflows/all-green.yml index c9e12e18b06..bc2204bb6e9 100644 --- a/.github/workflows/all-green.yml +++ b/.github/workflows/all-green.yml @@ -27,10 +27,8 @@ jobs: ignored-name-patterns: | dd-gitlab/default-pipeline dd-gitlab/check_inst 4/4 - dd-gitlab/muzzle .* # ignored jobs : # # * dd-gitlab/default-pipeline => success rate of 70% (needs an owner) # * dd-gitlab/check_inst 4/4 => success rate of 78% (needs an owner) -# * dd-gitlab/muzzle .* => success rate of ~85% (needs an owner)