Skip to content

Commit 7ae0ee8

Browse files
NvTimLiuNvTimLiu
committed
jenkins: use Artifactory v2 for URM and expand Maven settings
To fix: #14516 - Point premerge URM_URL at ARTIFACTORY_NAME_V2 - Add server credentials for upstream mirror ids; consolidate mirror profiles Signed-off-by: timl <timl@nvidia.com>
1 parent cc66afa commit 7ae0ee8

2 files changed

Lines changed: 38 additions & 37 deletions

File tree

‎jenkins/Jenkinsfile-blossom.premerge‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ pipeline {
7272
LIBCUDF_KERNEL_CACHE_PATH = '/tmp/.cudf'
7373
GITHUB_TOKEN = credentials("github-token")
7474

75-
// v1 instance for maven mirror only, will be migrated to v2 soon
76-
URM_URL = "https://${common.ARTIFACTORY_NAME}/artifactory/sw-spark-maven"
75+
URM_URL = "https://${common.ARTIFACTORY_NAME_V2}/artifactory/sw-spark-maven"
7776
MVN_URM_MIRROR = '-s jenkins/settings.xml -P mirror-apache-to-urm'
7877
// v2 instance for CI images usage
7978
URM_CREDS = credentials("urm_creds_v2")

‎jenkins/settings.xml‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,31 @@
2727
<password>${env.URM_CREDS_PSW}</password>
2828
<id>snapshots</id>
2929
</server>
30+
<server>
31+
<username>${env.URM_CREDS_USR}</username>
32+
<password>${env.URM_CREDS_PSW}</password>
33+
<id>cloudera-repo-fallback</id>
34+
</server>
35+
<server>
36+
<username>${env.URM_CREDS_USR}</username>
37+
<password>${env.URM_CREDS_PSW}</password>
38+
<id>apache.snapshots</id>
39+
</server>
40+
<server>
41+
<username>${env.URM_CREDS_USR}</username>
42+
<password>${env.URM_CREDS_PSW}</password>
43+
<id>apache.snapshots.https</id>
44+
</server>
45+
<server>
46+
<username>${env.URM_CREDS_USR}</username>
47+
<password>${env.URM_CREDS_PSW}</password>
48+
<id>apache-snapshots-repo</id>
49+
</server>
50+
<server>
51+
<username>${env.URM_CREDS_USR}</username>
52+
<password>${env.URM_CREDS_PSW}</password>
53+
<id>cloudera-repo</id>
54+
</server>
3055
<server>
3156
<id>ossrh</id>
3257
<username>${env.SONATYPE_USR}</username>
@@ -35,40 +60,41 @@
3560
</servers>
3661
<profiles>
3762
<profile>
63+
<id>artifactory</id>
3864
<repositories>
3965
<repository>
40-
<snapshots>
41-
<enabled>false</enabled>
42-
</snapshots>
4366
<id>central</id>
4467
<name>sw-spark-maven</name>
4568
<url>${env.URM_URL}</url>
69+
<snapshots>
70+
<enabled>false</enabled>
71+
</snapshots>
4672
</repository>
4773
<repository>
48-
<snapshots />
4974
<id>snapshots</id>
5075
<name>sw-spark-maven</name>
5176
<url>${env.URM_URL}</url>
77+
<snapshots />
5278
</repository>
5379
</repositories>
5480
<pluginRepositories>
5581
<pluginRepository>
56-
<snapshots>
57-
<enabled>false</enabled>
58-
</snapshots>
5982
<id>central</id>
6083
<name>sw-spark-maven</name>
6184
<url>${env.URM_URL}</url>
85+
<snapshots>
86+
<enabled>false</enabled>
87+
</snapshots>
6288
</pluginRepository>
6389
<pluginRepository>
64-
<snapshots />
6590
<id>snapshots</id>
6691
<name>sw-spark-maven</name>
6792
<url>${env.URM_URL}</url>
93+
<snapshots />
6894
</pluginRepository>
6995
</pluginRepositories>
70-
<id>artifactory</id>
7196
</profile>
97+
<!-- Maps upstream repo ids (POM mirrors) to URM; id kept for -P mirror-apache-to-urm in Jenkins -->
7298
<profile>
7399
<id>mirror-apache-to-urm</id>
74100
<repositories>
@@ -77,41 +103,21 @@
77103
<name>sw-spark-maven</name>
78104
<url>${env.URM_URL}</url>
79105
</repository>
80-
</repositories>
81-
</profile>
82-
<profile>
83-
<id>mirror-apache-https-to-urm</id>
84-
<repositories>
85106
<repository>
86107
<id>apache.snapshots.https</id>
87108
<name>sw-spark-maven</name>
88109
<url>${env.URM_URL}</url>
89110
</repository>
90-
</repositories>
91-
</profile>
92-
<profile>
93-
<id>mirror-apache2-to-urm</id>
94-
<repositories>
95111
<repository>
96112
<id>apache-snapshots-repo</id>
97113
<name>sw-spark-maven</name>
98114
<url>${env.URM_URL}</url>
99115
</repository>
100-
</repositories>
101-
</profile>
102-
<profile>
103-
<id>mirror-cloudera-to-urm</id>
104-
<repositories>
105116
<repository>
106117
<id>cloudera-repo</id>
107118
<name>sw-spark-maven</name>
108119
<url>${env.URM_URL}</url>
109120
</repository>
110-
</repositories>
111-
</profile>
112-
<profile>
113-
<id>mirror-cloudera-fallback-to-urm</id>
114-
<repositories>
115121
<repository>
116122
<id>cloudera-repo-fallback</id>
117123
<name>sw-spark-maven</name>
@@ -122,17 +128,13 @@
122128
<profile>
123129
<id>deploy-to-urm</id>
124130
<properties>
125-
<altDeploymentRepository>snapshots::default::${env.URM_URL}-local</altDeploymentRepository>
131+
<altDeploymentRepository>snapshots::default::${env.URM_URL}-local</altDeploymentRepository>
126132
</properties>
127-
</profile>
133+
</profile>
128134
</profiles>
129135
<activeProfiles>
130136
<activeProfile>artifactory</activeProfile>
131137
<activeProfile>mirror-apache-to-urm</activeProfile>
132-
<activeProfile>mirror-apache-https-to-urm</activeProfile>
133-
<activeProfile>mirror-apache2-to-urm</activeProfile>
134-
<activeProfile>mirror-cloudera-to-urm</activeProfile>
135-
<activeProfile>mirror-cloudera-fallback-to-urm</activeProfile>
136138
<activeProfile>deploy-to-urm</activeProfile>
137139
</activeProfiles>
138140
</settings>

0 commit comments

Comments
 (0)