diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abee6cf41e9..6f7bf8fc784 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,13 +136,16 @@ default: policy: $BUILD_CACHE_POLICY before_script: - source .gitlab/gitlab-utils.sh - - export GRADLE_USER_HOME=`pwd`/.gradle + - export GRADLE_USER_HOME=$(pwd)/.gradle - | # Don't put jvm args here as it will be picked up by child gradle processes used in tests cat << EOF > $GRADLE_USER_HOME/gradle.properties mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY gradlePluginProxy=$GRADLE_PLUGIN_PROXY EOF + - | + # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties + sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx$GRADLE_MEM -Xms$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'" - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS" - *normalize_node_index @@ -371,7 +374,7 @@ muzzle: - ./gradlew writeMuzzleTasksToFile $GRADLE_ARGS - sort workspace/build/muzzleTasks > sortedMuzzleTasks - split --number=l/$NORMALIZED_NODE_TOTAL --suffix-length=1 --numeric-suffixes sortedMuzzleTasks muzzleSplit - - ./gradlew `cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs` $GRADLE_ARGS + - ./gradlew $(cat muzzleSplit${NORMALIZED_NODE_INDEX} | xargs) $GRADLE_ARGS after_script: - *cgroup_info - source .gitlab/gitlab-utils.sh