@@ -12,8 +12,8 @@ kubernetes:
12
12
cloud : il-ipp-blossom-prod
13
13
nodeSelector : ' beta.kubernetes.io/os=linux'
14
14
namespace : swx-media
15
- limits : ' {memory: 8Gi , cpu: 7000m }'
16
- requests : ' {memory: 8Gi , cpu: 7000m }'
15
+ limits : ' {memory: 10Gi , cpu: 10000m }'
16
+ requests : ' {memory: 10Gi , cpu: 10000m }'
17
17
18
18
credentials :
19
19
- {credentialsId: 'media_coverity_credentials', usernameVariable: 'XLIO_COV_USER', passwordVariable: 'XLIO_COV_PASSWORD'}
@@ -67,14 +67,14 @@ runs_on_dockers:
67
67
tag : ' 20241001' ,
68
68
build_args : ' --build-arg ARCH=aarch64 --no-cache' ,
69
69
category : ' base'
70
- }
70
+ }
71
71
# tool
72
72
- {
73
73
file : ' .ci/dockerfiles/Dockerfile.ubuntu22.04' ,
74
74
arch : ' x86_64' ,
75
75
name : ' style' ,
76
76
uri : ' xlio/$arch/ubuntu22.04/$name' ,
77
- tag : ' 20240812 ' ,
77
+ tag : ' 20250219 ' ,
78
78
build_args : ' --no-cache --target style' ,
79
79
category : ' tool'
80
80
}
@@ -98,9 +98,58 @@ runs_on_dockers:
98
98
build_args : ' --no-cache' ,
99
99
category : ' tool'
100
100
}
101
-
102
- runs_on_agents :
103
- - {nodeLabel: 'beni09', category: 'base'}
101
+ # tests
102
+ - {
103
+ file : ' .ci/dockerfiles/Dockerfile.ubuntu22.04' ,
104
+ arch : ' x86_64' ,
105
+ name : ' test' ,
106
+ uri : ' xlio/$arch/ubuntu22.04/$name' ,
107
+ tag : ' 20250219' ,
108
+ build_args : ' --no-cache --target test' ,
109
+ category : ' tests' ,
110
+ annotations : [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1' }],
111
+ limits : ' {memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p1: 1}' ,
112
+ requests : ' {memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p1: 1}' ,
113
+ caps_add : ' [ IPC_LOCK, SYS_RESOURCE ]' ,
114
+ runAsUser : ' 0' ,
115
+ runAsGroup : ' 0' ,
116
+ cloud : swx-k8s-spray,
117
+ namespace : xlio-ci
118
+ }
119
+ - {
120
+ file : ' .ci/dockerfiles/Dockerfile.ubuntu22.04' ,
121
+ arch : ' x86_64' ,
122
+ name : ' vg' ,
123
+ uri : ' xlio/$arch/ubuntu22.04/$name' ,
124
+ tag : ' 20250219' ,
125
+ build_args : ' --no-cache --target vg' ,
126
+ category : ' tool' ,
127
+ annotations : [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
128
+ limits : ' {memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p2: 1}' ,
129
+ requests : ' {memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p2: 1}' ,
130
+ caps_add : ' [ IPC_LOCK, SYS_RESOURCE ]' ,
131
+ runAsUser : ' 0' ,
132
+ runAsGroup : ' 0' ,
133
+ cloud : swx-k8s-spray,
134
+ namespace : xlio-ci
135
+ }
136
+ - {
137
+ file : ' .ci/dockerfiles/Dockerfile.ubuntu22.04' ,
138
+ arch : ' x86_64' ,
139
+ name : ' gtest' ,
140
+ uri : ' xlio/$arch/ubuntu22.04/$name' ,
141
+ tag : ' 20250219' ,
142
+ build_args : ' --no-cache --target gtest' ,
143
+ category : ' tests' ,
144
+ annotations : [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1@net1,sriov-cx6dx-p2@net2' }],
145
+ limits : ' {memory: 10Gi, cpu: 10000m, hugepages-2Mi: 8Gi, mellanox.com/sriov_cx6dx_p1: 1, mellanox.com/sriov_cx6dx_p2: 1}' ,
146
+ requests : ' {memory: 10Gi, cpu: 10000m, hugepages-2Mi: 8Gi, mellanox.com/sriov_cx6dx_p1: 1, mellanox.com/sriov_cx6dx_p2: 1}' ,
147
+ caps_add : ' [ IPC_LOCK, SYS_RESOURCE ]' ,
148
+ runAsUser : ' 0' ,
149
+ runAsGroup : ' 0' ,
150
+ cloud : swx-k8s-spray,
151
+ namespace : xlio-ci
152
+ }
104
153
105
154
matrix :
106
155
axes :
@@ -133,8 +182,9 @@ steps:
133
182
- name : Install Doca-host
134
183
containerSelector :
135
184
- " {category: 'base'}"
136
- agentSelector :
137
- - " {nodeLabel: 'skip-agent'}"
185
+ - " {name: 'test'}"
186
+ - " {name: 'gtest'}"
187
+ - " {name: 'vg'}"
138
188
run : |
139
189
echo "Installing DOCA: ${DOCA_VERSION} ..."
140
190
.ci/scripts/doca_install.sh
@@ -145,17 +195,13 @@ steps:
145
195
.ci/scripts/doca_install.sh
146
196
containerSelector :
147
197
- " {name: 'style', category: 'tool', variant: 1}"
148
- agentSelector :
149
- - " {nodeLabel: 'skip-agent'}"
150
198
151
199
- name : Copyrights
152
200
enable : ${do_copyrights}
153
201
credentialsId : ' mellanox_github_credentials'
154
202
run : env WORKSPACE=$PWD GITHUB_TOKEN=$MELLANOX_GH_TOKEN ./contrib/jenkins_tests/copyrights.sh
155
203
containerSelector :
156
204
- " {name: 'header-check', category: 'tool', variant: 1}"
157
- agentSelector :
158
- - " {nodeLabel: 'skip-agent'}"
159
205
archiveArtifacts : ' *.log,*.tar.gz'
160
206
parallel : false
161
207
@@ -167,9 +213,6 @@ steps:
167
213
- name : Build
168
214
enable : ${do_build}
169
215
containerSelector :
170
- - " {category: 'base'}"
171
- agentSelector :
172
- - " {category: 'base'}"
173
216
run : |
174
217
[ "x${do_build}" == "xtrue" ] && action=yes || action=no
175
218
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_build=${action} ./contrib/test_jenkins.sh
@@ -183,8 +226,6 @@ steps:
183
226
enable : ${do_service}
184
227
containerSelector :
185
228
- " {category: 'base', variant:1}"
186
- agentSelector :
187
- - " {category: 'base', variant:1}"
188
229
run : |
189
230
[ "x${do_service}" == "xtrue" ] && action=yes || action=no
190
231
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_tool=${action} ./contrib/test_jenkins.sh
@@ -198,8 +239,6 @@ steps:
198
239
enable : ${do_package}
199
240
containerSelector :
200
241
- " {category: 'base'}"
201
- agentSelector :
202
- - " {nodeLabel: 'skip-agent'}"
203
242
run : |
204
243
[ "x${do_package}" == "xtrue" ] && action=yes || action=no
205
244
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_rpm=${action} ./contrib/test_jenkins.sh
@@ -213,8 +252,6 @@ steps:
213
252
enable : ${do_antivirus}
214
253
containerSelector :
215
254
- " {name: 'rhel8.3-mofed-x86_64', category: 'base', variant: 1}"
216
- agentSelector :
217
- - " {nodeLabel: 'skip-agent'}"
218
255
run : |
219
256
env WORKSPACE=$PWD .ci/antivirus.sh ${release_folder}
220
257
archiveArtifacts : ' logs/'
@@ -223,8 +260,6 @@ steps:
223
260
enable : ${do_style}
224
261
containerSelector :
225
262
- " {name: 'style', category: 'tool'}"
226
- agentSelector :
227
- - " {nodeLabel: 'skip-agent'}"
228
263
run : |
229
264
[ "x${do_style}" == "xtrue" ] && action=yes || action=no
230
265
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_style=${action} ./contrib/test_jenkins.sh
@@ -238,8 +273,6 @@ steps:
238
273
enable : ${do_compiler}
239
274
containerSelector :
240
275
- " {name: 'toolbox', category: 'tool'}"
241
- agentSelector :
242
- - " {nodeLabel: 'skip-agent'}"
243
276
run : |
244
277
[ "x${do_compiler}" == "xtrue" ] && action=yes || action=no
245
278
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_compiler=${action} ./contrib/test_jenkins.sh
@@ -254,8 +287,6 @@ steps:
254
287
credentialsId : ' media_coverity_credentials'
255
288
containerSelector :
256
289
- " {name: 'toolbox', category: 'tool'}"
257
- agentSelector :
258
- - " {nodeLabel: 'skip-agent'}"
259
290
run : |
260
291
[ "x${do_coverity}" == "xtrue" ] && action=yes || action=no
261
292
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_cov=${action} ./contrib/test_jenkins.sh
@@ -270,8 +301,6 @@ steps:
270
301
enable : ${do_cppcheck}
271
302
containerSelector :
272
303
- " {name: 'xlio_static.cppcheck', category: 'tool', variant: 1}"
273
- agentSelector :
274
- - " {nodeLabel: 'skip-agent'}"
275
304
run : |
276
305
[ "x${do_cppcheck}" == "xtrue" ] && action=yes || action=no
277
306
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_cppcheck=${action} ./contrib/test_jenkins.sh
@@ -285,8 +314,6 @@ steps:
285
314
enable : ${do_csbuild}
286
315
containerSelector :
287
316
- " {name: 'xlio_static.csbuild', category: 'tool', variant: 1}"
288
- agentSelector :
289
- - " {nodeLabel: 'skip-agent'}"
290
317
run : |
291
318
[ "x${do_csbuild}" == "xtrue" ] && action=yes || action=no
292
319
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_csbuild=${action} ./contrib/test_jenkins.sh
@@ -299,9 +326,7 @@ steps:
299
326
- name : Test
300
327
enable : ${do_test}
301
328
containerSelector :
302
- - " {name: 'skip-container'}"
303
- agentSelector :
304
- - " {nodeLabel: 'beni09'}"
329
+ - " {name: 'test'}"
305
330
run : |
306
331
[ "x${do_test}" == "xtrue" ] && action=yes || action=no
307
332
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_run=${action} ./contrib/test_jenkins.sh
@@ -314,9 +339,7 @@ steps:
314
339
- name : Gtest
315
340
enable : ${do_gtest}
316
341
containerSelector :
317
- - " {name: 'skip-container'}"
318
- agentSelector :
319
- - " {nodeLabel: 'beni09'}"
342
+ - " {name: 'gtest'}"
320
343
run : |
321
344
[ "x${do_gtest}" == "xtrue" ] && action=yes || action=no
322
345
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_gtest=${action} ./contrib/test_jenkins.sh
@@ -331,9 +354,7 @@ steps:
331
354
- name : Valgrind
332
355
enable : ${do_valgrind}
333
356
containerSelector :
334
- - " {name: 'skip-container'}"
335
- agentSelector :
336
- - " {nodeLabel: 'beni09'}"
357
+ - " {name: 'vg'}"
337
358
run : |
338
359
[ "x${do_valgrind}" == "xtrue" ] && action=yes || action=no
339
360
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_vg=${action} ./contrib/test_jenkins.sh
@@ -348,8 +369,6 @@ steps:
348
369
enable : ${do_commit}
349
370
containerSelector :
350
371
- " {name: 'toolbox', category: 'tool', variant:1}"
351
- agentSelector :
352
- - " {nodeLabel: 'skip-agent'}"
353
372
run : |
354
373
[ "x${do_commit}" == "xtrue" ] && action=yes || action=no
355
374
env WORKSPACE=$PWD TARGET=${flags} jenkins_test_commit=${action} ./contrib/test_jenkins.sh
@@ -373,8 +392,6 @@ steps:
373
392
enable : ${do_blackduck}
374
393
containerSelector :
375
394
- " {name: 'blackduck', category:'tool', variant:1}"
376
- agentSelector :
377
- - " {nodeLabel: 'skip-agent'}"
378
395
shell : action
379
396
module : ngci
380
397
run : NGCIBlackDuckScan
@@ -401,4 +418,4 @@ pipeline_stop:
401
418
402
419
failFast : false
403
420
404
- taskName : ' ${flags}/${name}/${axis_index}'
421
+ taskName : ' ${flags}/${arch}/${ name}/${axis_index}'
0 commit comments