Skip to content

Commit 04a06f8

Browse files
committed
Skip tests based on git changes on GitLab
1 parent becbf2a commit 04a06f8

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

.gitlab-ci.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,11 @@ build_tests:
223223
MAVEN_OPTS: "-Xms64M -Xmx512M -Dorg.slf4j.simpleLogger.defaultLogLevel=debug" # FIXME: Build :smokeTest build fails unless mvn debug logging is on
224224

225225
script:
226-
- ./gradlew clean $GRADLE_TARGET -PskipTests $GRADLE_ARGS
226+
- |
227+
if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
228+
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$CI_DEFAULT_BRANCH"
229+
fi
230+
- ./gradlew clean $GRADLE_TARGET $GRADLE_PARAMS -PskipTests $GRADLE_ARGS
227231

228232
populate_dep_cache:
229233
extends: build_tests
@@ -327,7 +331,11 @@ test_published_artifacts:
327331
variables:
328332
CACHE_TYPE: lib
329333
script:
330-
- ./gradlew $GRADLE_TARGET -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
334+
- |
335+
if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
336+
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$CI_DEFAULT_BRANCH"
337+
fi
338+
- ./gradlew $GRADLE_TARGET $GRADLE_PARAMS -PskipTests -PrunBuildSrcTests -PskipSpotless -PtaskPartitionCount=$NORMALIZED_NODE_TOTAL -PtaskPartition=$NORMALIZED_NODE_INDEX $GRADLE_ARGS
331339
after_script:
332340
- *cgroup_info
333341
- source .gitlab/gitlab-utils.sh
@@ -460,6 +468,10 @@ muzzle-dep-report:
460468
- if: $CI_COMMIT_BRANCH == "master"
461469
when: on_success
462470
script:
471+
- |
472+
if [[ ! $CI_COMMIT_BRANCH =~ ^(master|release/.*)$ ]]; then
473+
export GRADLE_PARAMS="$GRADLE_PARAMS -PgitBaseRef=origin/$CI_DEFAULT_BRANCH"
474+
fi
463475
- >
464476
if [ "$PROFILE_TESTS" == "true" ] && [ "$testJvm" != "ibm8" ] && [ "$testJvm" != "oracle8" ];
465477
then

0 commit comments

Comments
 (0)