Skip to content

Commit b3bc64a

Browse files
committed
build(ci): Move cgroup info to .gradle_build
1 parent bcde6bb commit b3bc64a

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

.gitlab-ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ default:
9696
- ONE_INDEXED_NODE_INDEX=${CI_NODE_INDEX:-1}; export NORMALIZED_NODE_INDEX=$((ONE_INDEXED_NODE_INDEX - 1))
9797
- echo "NORMALIZED_NODE_TOTAL=${NORMALIZED_NODE_TOTAL}, NORMALIZED_NODE_INDEX=$NORMALIZED_NODE_INDEX"
9898

99+
.cgroup_info: &cgroup_info
100+
- source .gitlab/gitlab-utils.sh
101+
- gitlab_section_start "cgroup-info" "cgroup info"
102+
- .gitlab/cgroup-info.sh
103+
- gitlab_section_end "cgroup-info"
104+
99105
.gradle_build: &gradle_build
100106
image: ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
101107
stage: build
@@ -141,6 +147,8 @@ default:
141147
- mv .gradle-copy .gradle
142148
- ls -la
143149
- gitlab_section_end "gradle-dance"
150+
after_script:
151+
- *cgroup_info
144152

145153
build:
146154
extends: .gradle_build
@@ -244,6 +252,7 @@ test_published_artifacts:
244252
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms1G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
245253
- ./gradlew check --info $GRADLE_ARGS
246254
after_script:
255+
- *cgroup_info
247256
- source .gitlab/gitlab-utils.sh
248257
- gitlab_section_start "collect-reports" "Collecting reports"
249258
- .circleci/collect_reports.sh
@@ -262,6 +271,7 @@ test_published_artifacts:
262271
script:
263272
- ./gradlew $GRADLE_TARGET -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
264273
after_script:
274+
- *cgroup_info
265275
- source .gitlab/gitlab-utils.sh
266276
- gitlab_section_start "collect-reports" "Collecting reports"
267277
- .circleci/collect_reports.sh --destination ./check_reports --move
@@ -322,6 +332,7 @@ muzzle:
322332
- split --number=l/$NORMALIZED_NODE_TOTAL --suffix-length=1 --numeric-suffixes sortedMuzzleTasks muzzleSplit
323333
- ./gradlew `cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs` $GRADLE_ARGS
324334
after_script:
335+
- *cgroup_info
325336
- source .gitlab/gitlab-utils.sh
326337
- gitlab_section_start "collect-reports" "Collecting reports"
327338
- .circleci/collect_reports.sh
@@ -342,6 +353,7 @@ muzzle-dep-report:
342353
- export SKIP_BUILDSCAN="true"
343354
- ./gradlew generateMuzzleReport muzzleInstrumentationReport $GRADLE_ARGS
344355
after_script:
356+
- *cgroup_info
345357
- .circleci/collect_muzzle_deps.sh
346358
artifacts:
347359
when: always
@@ -401,13 +413,13 @@ muzzle-dep-report:
401413
after_script:
402414
- *restore_pretest_env
403415
- *set_datadog_api_keys
416+
- *cgroup_info
404417
- source .gitlab/gitlab-utils.sh
405418
- gitlab_section_start "collect-reports" "Collecting reports"
406419
- .circleci/collect_reports.sh
407420
- if [ "$PROFILE_TESTS" == "true" ]; then .circleci/collect_profiles.sh; fi
408421
- .circleci/collect_results.sh
409422
- .circleci/upload_ciapp.sh $CACHE_TYPE $testJvm
410-
- .gitlab/cgroup-report.sh
411423
- gitlab_section_end "collect-reports"
412424
- URL_ENCODED_JOB_NAME=$(jq -rn --arg x "$CI_JOB_NAME" '$x|@uri')
413425
- echo -e "${TEXT_BOLD}${TEXT_YELLOW}See test results in Datadog:${TEXT_CLEAR} https://app.datadoghq.com/ci/test/runs?query=test_level%3Atest%20%40test.service%3Add-trace-java%20%40ci.pipeline.id%3A${CI_PIPELINE_ID}%20%40ci.job.name%3A%22${URL_ENCODED_JOB_NAME}%22"

0 commit comments

Comments
 (0)