From 101b88f2d5a9d6351cc8ec2b691e5f7eb8a32892 Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Wed, 17 Nov 2021 13:11:58 +0100 Subject: [PATCH 1/3] [FLINK-24984][ci] Rename MAVEN_OPTS variable --- tools/azure-pipelines/build-apache-repo.yml | 2 +- tools/ci/compile.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/azure-pipelines/build-apache-repo.yml b/tools/azure-pipelines/build-apache-repo.yml index 5aeb2d10a3ecd..ad18638643fb7 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 0f6cb9bb6bd18..78f93abbd9f63 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 $MAVEN_ARGS -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]} From ef64f367ef85171a563ce30304db77b91ff967c7 Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Tue, 23 Nov 2021 16:14:10 +0100 Subject: [PATCH 2/3] + --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c14230d20c712..3de6409a9fb3c 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 From 9c4df07c870d0067756a245eabb374c28f10b558 Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Tue, 23 Nov 2021 17:27:10 +0100 Subject: [PATCH 3/3] + --- tools/ci/compile.sh | 2 +- tools/ci/maven-utils.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci/compile.sh b/tools/ci/compile.sh index 78f93abbd9f63..1dd5b2e7464cd 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_ARGS -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 caea57b031e27..25922d4eab8a1 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