Skip to content

Commit dfec3ff

Browse files
authored
CI: Artifactory v2 URL and Maven server creds (#4425)
To fix: #4424 - Point ART_URL at ARTIFACTORY_NAME_V2 sw-spark-maven; - Add servers for apache.snapshots* repos so ART_URL uses ART_CREDS Signed-off-by: Tim Liu <timl@nvidia.com>
1 parent a0d85bd commit dfec3ff

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

ci/Jenkinsfile.premerge

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@ pipeline {
7070
JENKINS_ROOT = 'jenkins'
7171
GITHUB_TOKEN = credentials("github-token")
7272

73-
// v1 instance for maven mirror only, will be migrated to v2 soon
74-
ART_URL = "https://${common.ARTIFACTORY_NAME}/artifactory/sw-spark-maven"
73+
ART_URL = "https://${common.ARTIFACTORY_NAME_V2}/artifactory/sw-spark-maven"
7574
MVN_MIRROR = '-s ci/settings.xml -P mirror-apache-to-urm'
76-
// v2 instance for CI images usage
7775
ART_CREDS = credentials("urm_creds_v2")
7876
ARTIFACTORY_NAME = "${common.ARTIFACTORY_NAME_V2}"
7977

ci/settings.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@
2828
<password>${env.ART_CREDS_PSW}</password>
2929
<id>snapshots</id>
3030
</server>
31+
<server>
32+
<username>${env.ART_CREDS_USR}</username>
33+
<password>${env.ART_CREDS_PSW}</password>
34+
<id>apache.snapshots</id>
35+
</server>
36+
<server>
37+
<username>${env.ART_CREDS_USR}</username>
38+
<password>${env.ART_CREDS_PSW}</password>
39+
<id>apache.snapshots.https</id>
40+
</server>
41+
<server>
42+
<username>${env.ART_CREDS_USR}</username>
43+
<password>${env.ART_CREDS_PSW}</password>
44+
<id>apache-snapshots-repo</id>
45+
</server>
3146
<server>
3247
<id>ossrh</id>
3348
<username>${env.SONATYPE_USR}</username>

0 commit comments

Comments
 (0)