@@ -119,6 +119,13 @@ default:
119119 - .gitlab/cgroup-info.sh
120120 - gitlab_section_end "cgroup-info"
121121
122+ .gitlab_base_ref_params : &gitlab_base_ref_params
123+ - |
124+ if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
125+ export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh)
126+ export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF"
127+ fi
128+
122129.gradle_build : &gradle_build
123130 image : ghcr.io/datadog/dd-trace-java-docker-build:${BUILDER_IMAGE_VERSION_PREFIX}base
124131 stage : build
@@ -223,11 +230,7 @@ build_tests:
223230 MAVEN_OPTS : " -Xms64M -Xmx512M -Dorg.slf4j.simpleLogger.defaultLogLevel=debug" # FIXME: Build :smokeTest build fails unless mvn debug logging is on
224231
225232 script :
226- - |
227- if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
228- export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh)
229- export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF"
230- fi
233+ - *gitlab_base_ref_params
231234 - ./gradlew clean $GRADLE_TARGET $GRADLE_PARAMS -PskipTests $GRADLE_ARGS
232235
233236populate_dep_cache :
@@ -332,11 +335,7 @@ test_published_artifacts:
332335 variables :
333336 CACHE_TYPE : lib
334337 script :
335- - |
336- if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
337- export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh)
338- export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF"
339- fi
338+ - *gitlab_base_ref_params
340339 - ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
341340 after_script :
342341 - *cgroup_info
@@ -470,11 +469,7 @@ muzzle-dep-report:
470469 - if : $CI_COMMIT_BRANCH == "master"
471470 when : on_success
472471 script :
473- - |
474- if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
475- export GIT_BASE_REF=$(.gitlab/find-gh-base-ref.sh)
476- export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$GIT_BASE_REF"
477- fi
472+ - *gitlab_base_ref_params
478473 - >
479474 if [ "$PROFILE_TESTS" == "true" ] && [ "$testJvm" != "ibm8" ] && [ "$testJvm" != "oracle8" ];
480475 then
0 commit comments