From 1305b24897c1f2e62f2245f3e136e4c895caef04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Sat, 18 Feb 2023 14:41:20 +0100
Subject: [PATCH] Use artifact caching proxy for Jenkins Core builds (#7649)

* Use artifact caching proxy for Jenkins Core builds

* pipeline library PR merged

* restore empty line
---
 Jenkinsfile | 4 +++-
 ath.sh      | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7612936de23e..40bdcf9f6cc3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -152,7 +152,9 @@ builds.ath = {
       // Just to be safe
       deleteDir()
       checkout scm
-      sh 'bash ath.sh'
+      infra.withArtifactCachingProxy {
+        sh 'bash ath.sh'
+      }
       junit testResults: 'target/ath-reports/TEST-*.xml', testDataPublishers: [[$class: 'AttachmentPublisher']]
     }
   }
diff --git a/ath.sh b/ath.sh
index ae24e84a27e0..664aaa7bfe06 100644
--- a/ath.sh
+++ b/ath.sh
@@ -8,9 +8,12 @@ cd "$(dirname "$0")"
 # https://github.com/jenkinsci/acceptance-test-harness/releases
 export ATH_VERSION=5497.vca_4a_876045ce
 
-# TODO use Artifactory proxy?
+MVN='mvn -B -ntp -Pquick-build -am -pl war package'
+if [[ -n ${MAVEN_SETTINGS-} ]]; then
+	MVN="${MVN} -s ${MAVEN_SETTINGS}"
+fi
 
-[[ -f war/target/jenkins.war ]] || mvn -B -ntp -Pquick-build -am -pl war package
+[[ -f war/target/jenkins.war ]] || $MVN
 
 mkdir -p target/ath-reports
 chmod a+rwx target/ath-reports