This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 5a3c843 [FLINK-24984][ci] Rename MAVEN_OPTS variable
5a3c843 is described below
commit 5a3c843d5e92073d546dba858030700a36582392
Author: Chesnay Schepler <[email protected]>
AuthorDate: Wed Nov 24 09:30:50 2021 +0100
[FLINK-24984][ci] Rename MAVEN_OPTS variable
---
azure-pipelines.yml | 2 +-
tools/azure-pipelines/build-apache-repo.yml | 2 +-
tools/ci/compile.sh | 2 +-
tools/ci/maven-utils.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c14230d..3de6409 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,7 +50,7 @@ variables:
MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
E2E_CACHE_FOLDER: $(Pipeline.Workspace)/e2e_cache
E2E_TARBALL_CACHE: $(Pipeline.Workspace)/e2e_artifact_cache
- MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+ MAVEN_ARGS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
CACHE_KEY: maven | $(Agent.OS) | **/pom.xml, !**/target/**
CACHE_FALLBACK_KEY: maven | $(Agent.OS)
DOCKER_IMAGES_CACHE_KEY: docker-images-cache | $(Agent.OS) |
**/cache_docker_images.sh | flink-test-utils-parent/**/DockerImageVersions.java
diff --git a/tools/azure-pipelines/build-apache-repo.yml
b/tools/azure-pipelines/build-apache-repo.yml
index 5aeb2d1..ad18638 100644
--- a/tools/azure-pipelines/build-apache-repo.yml
+++ b/tools/azure-pipelines/build-apache-repo.yml
@@ -44,7 +44,7 @@ variables:
MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
E2E_CACHE_FOLDER: $(Pipeline.Workspace)/e2e_cache
E2E_TARBALL_CACHE: $(Pipeline.Workspace)/e2e_artifact_cache
- MAVEN_OPTS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+ MAVEN_ARGS: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
CACHE_KEY: maven | $(Agent.OS) | **/pom.xml, !**/target/**
CACHE_FALLBACK_KEY: maven | $(Agent.OS)
DOCKER_IMAGES_CACHE_KEY: docker-images-cache | $(Agent.OS) |
**/cache_docker_images.sh | flink-test-utils-parent/**/DockerImageVersions.java
diff --git a/tools/ci/compile.sh b/tools/ci/compile.sh
index 0f6cb9b..1dd5b2e 100755
--- a/tools/ci/compile.sh
+++ b/tools/ci/compile.sh
@@ -47,7 +47,7 @@ echo
"==========================================================================
EXIT_CODE=0
-run_mvn clean deploy
-DaltDeploymentRepository=validation_repository::default::file:$MVN_VALIDATION_DIR
$MAVEN_OPTS -Dflink.convergence.phase=install -Pcheck-convergence
-Dflink.forkCount=2 \
+run_mvn clean deploy
-DaltDeploymentRepository=validation_repository::default::file:$MVN_VALIDATION_DIR
-Dflink.convergence.phase=install -Pcheck-convergence -Dflink.forkCount=2 \
-Dflink.forkCountTestPackage=2 -Dmaven.javadoc.skip=true -U -DskipTests |
tee $MVN_CLEAN_COMPILE_OUT
EXIT_CODE=${PIPESTATUS[0]}
diff --git a/tools/ci/maven-utils.sh b/tools/ci/maven-utils.sh
index caea57b..25922d4 100755
--- a/tools/ci/maven-utils.sh
+++ b/tools/ci/maven-utils.sh
@@ -94,7 +94,7 @@
MAVEN_VERSIONED_DIR=${MAVEN_CACHE_DIR}/apache-maven-${MAVEN_VERSION}
MAVEN_MIRROR_CONFIG_FILE=""
set_mirror_config
-export MVN_GLOBAL_OPTIONS_WITHOUT_MIRROR=""
+export MVN_GLOBAL_OPTIONS_WITHOUT_MIRROR="$MAVEN_ARGS "
# see
https://developercommunity.visualstudio.com/content/problem/851041/microsoft-hosted-agents-run-into-maven-central-tim.html
MVN_GLOBAL_OPTIONS_WITHOUT_MIRROR+="-Dmaven.wagon.http.pool=false "
# logging
