Use artifact caching proxy for Jenkins Core builds (jenkinsci#7649)

* Use artifact caching proxy for Jenkins Core builds * pipeline library PR merged * restore empty line
bphinz · Feb 18, 2023 · 1305b24 · 1305b24
1 parent b0041ce
commit 1305b24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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